kes Correct return status on db_batch... routines.

[bacula/bacula] / bacula / src / dird / ua_status.c

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index fbc162814644bbd3e653d62bb895955fdba0594d..feb3aa790a8e6f86010c5b9ac05d37ddfcc6dc0a 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -1,15 +1,7 @@
-/*
- *
- *   Bacula Director -- User Agent Status Command
- *
- *     Kern Sibbald, August MMI
- *
- *   Version $Id$
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -33,6 +25,14 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ *
+ *   Bacula Director -- User Agent Status Command
+ *
+ *     Kern Sibbald, August MMI
+ *
+ *   Version $Id$
+ */
 
 
 #include "bacula.h"
@@ -52,26 +52,24 @@ static char DotStatusJob[] = "JobId=%s JobStatus=%c JobErrors=%d\n";
 /*
  * .status command
  */
-int qstatus_cmd(UAContext *ua, const char *cmd)
+
+bool dot_status_cmd(UAContext *ua, const char *cmd)
 {
    JCR* njcr = NULL;
    s_last_job* job;
    char ed1[50];
 
-   if (!open_db(ua)) {
-      return 1;
-   }
    Dmsg1(20, "status:%s:\n", cmd);
 
    if ((ua->argc != 3) || (strcasecmp(ua->argk[1], "dir"))) {
       bsendmsg(ua, "1900 Bad .status command, missing arguments.\n");
-      return 1;
+      return false;
    }
 
    if (strcasecmp(ua->argk[2], "current") == 0) {
       bsendmsg(ua, OKqstatus, ua->argk[2]);
       foreach_jcr(njcr) {
-         if (njcr->JobId != 0) {
+         if (njcr->JobId != 0 && acl_access_ok(ua, Job_ACL, njcr->job->name())) {
             bsendmsg(ua, DotStatusJob, edit_int64(njcr->JobId, ed1), 
                      njcr->JobStatus, njcr->JobErrors);
          }
@@ -81,14 +79,25 @@ int qstatus_cmd(UAContext *ua, const char *cmd)
       bsendmsg(ua, OKqstatus, ua->argk[2]);
       if ((last_jobs) && (last_jobs->size() > 0)) {
          job = (s_last_job*)last_jobs->last();
-         bsendmsg(ua, DotStatusJob, edit_int64(job->JobId, ed1), 
+         if (acl_access_ok(ua, Job_ACL, job->Job)) {
+            bsendmsg(ua, DotStatusJob, edit_int64(job->JobId, ed1), 
                   job->JobStatus, job->Errors);
+         }
       }
    } else {
       bsendmsg(ua, "1900 Bad .status command, wrong argument.\n");
-      return 1;
+      return false;
    }
 
+   return true;
+}
+
+/* This is the *old* command handler, so we must return
+ *  1 or it closes the connection
+ */
+int qstatus_cmd(UAContext *ua, const char *cmd)
+{
+   dot_status_cmd(ua, cmd);
    return 1;
 }
 
@@ -101,9 +110,6 @@ int status_cmd(UAContext *ua, const char *cmd)
    CLIENT *client;
    int item, i;
 
-   if (!open_db(ua)) {
-      return 1;
-   }
    Dmsg1(20, "status:%s:\n", cmd);
 
    for (i=1; i<ua->argc; i++) {
@@ -641,7 +647,7 @@ static void list_running_jobs(UAContext *ua)
          break;
       case JS_WaitFD:
          if (!pool_mem) {
-            emsg = (char *) get_pool_memory(PM_FNAME);
+            emsg = (char *)get_pool_memory(PM_FNAME);
             pool_mem = true;
          }
          Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),