BEE Backport dird files

diff --git a/bacula/src/dird/bsr.h b/bacula/src/dird/bsr.h
index da103e38bc4494701a24db949076d64e3ae63dd4..942d6d02f7388b42f2815883e6d50f13a6f108c6 100644 (file)
--- a/bacula/src/dird/bsr.h
+++ b/bacula/src/dird/bsr.h
@@ -17,12 +17,14 @@
    Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
+ *
  *   Bootstrap Record header file
  *
  *      BSR (bootstrap record) handling routines split from
  *        ua_restore.c July MMIII
  *
  *     Kern Sibbald, July MMII
+ *
  */
 
 #ifndef BSR_H

diff --git a/bacula/src/dird/dird.h b/bacula/src/dird/dird.h
index c4cc7deb2d24109171dd7326b2b02cf0f3aba3a6..40c06d439527d170120727eff4f2331366031524 100644 (file)
--- a/bacula/src/dird/dird.h
+++ b/bacula/src/dird/dird.h
@@ -20,6 +20,7 @@
  * Includes specific to the Director
  *
  *     Kern Sibbald, December MM
+ *
  */
 
 #include "lib/ini.h"

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 59a9d6638f47da831ea2e437bc61b8f878a69838..a816188f782714a5a91b49881ecfa4f7a3d68088 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -261,7 +261,7 @@ inline char *CAT::name() const { return hdr.name; }
 class CLIENT_GLOBALS {
 public:
    dlink link;                        /* double link */
-   const char *name;                  /* resource name */
+   char *name;                        /* resource name */
    int32_t NumConcurrentJobs;         /* number of concurrent jobs running */
    char *SetIPaddress;                /* address from SetIP command */
    int enabled;                       /* -1: not set, 0 disabled, 1 enabled */
@@ -325,7 +325,7 @@ inline char *CLIENT::name() const { return hdr.name; }
 class STORE_GLOBALS {
 public:
    dlink link;                        /* double link */
-   const char *name;                  /* resource name */
+   char *name;                        /* resource name */
    int32_t NumConcurrentJobs;         /* number of concurrent jobs running */
    int32_t NumConcurrentReadJobs;     /* number of concurrent read jobs running */
    int enabled;                       /* -1: not set, 0: disabled, 1: enabled */
@@ -430,7 +430,7 @@ inline void USTORE::set_source(const char *where)
 class JOB_GLOBALS {
 public:
    dlink link;                        /* double link */
-   const char *name;                  /* resource name */
+   char *name;                        /* resource name */
    int32_t NumConcurrentJobs;         /* number of concurrent jobs running */
    int enabled;                       /* -1: disabled, 0: disabled, 1: Enabled */
 };
@@ -633,7 +633,7 @@ inline char *FILESET::name() const { return hdr.name; }
 class SCHED_GLOBALS {
 public:
    dlink link;                        /* double link */
-   const char *name;                  /* resource name */
+   char *name;                        /* resource name */
    int enabled;                       /* -1: not set, 0: disabled, 1: Enabled */
 };
 

diff --git a/bacula/src/dird/recycle.c b/bacula/src/dird/recycle.c
index a4ae896661b3de62da478e75b4f2e3094b6c394f..db36c14e53db139d95ecd3456535291c576db0ee 100644 (file)
--- a/bacula/src/dird/recycle.c
+++ b/bacula/src/dird/recycle.c
@@ -17,10 +17,12 @@
    Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
+ *
  *   Bacula Director -- Automatic Recycling of Volumes
  *      Recycles Volumes that have been purged
  *
  *     Kern Sibbald, May MMII
+ *
  */
 
 

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 866faf5bfc303848321db837d58e511485345ecc..ae814d601c91933dfd5be4cfb992f42ccec7c651 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -2549,7 +2549,6 @@ static void do_storage_cmd(UAContext *ua, const char *command)
       ua->send_msg("%s", sd->msg);
    }
    sd->signal(BNET_TERMINATE);
-
 bail_out:
    free_bsock(ua->jcr->store_bsock);
 }

diff --git a/bacula/src/dird/ua_query.c b/bacula/src/dird/ua_query.c
index 6d891dccacf24f27afa1febc647b07767be2222e..ddb30169b87ca1e03f895919c21b2c3f95a9b12e 100644 (file)
--- a/bacula/src/dird/ua_query.c
+++ b/bacula/src/dird/ua_query.c
@@ -17,11 +17,9 @@
    Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
- *
  *   Bacula Director -- User Agent Database Query Commands
  *
  *     Kern Sibbald, December MMI
- *
  */
 
 #include "bacula.h"

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 24a438f0da861f7e0180dc6fa4b623b979c2c0a6..5ccea0d63cd3ffcd11c4ee78b3bf0572c760252d 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -1217,7 +1217,7 @@ static void list_scheduled_jobs(UAContext *ua)
    if (i >= 0 && is_a_number(ua->argv[i])) {
       limit=atoi(ua->argv[i]);
       if (limit == 0) {
-         limit = -1;            // disable limit
+         limit = -1;            // disable limit, 0 means nothing in this context
       }
    } else if (ua->api) {
       limit = -1;               // no limit with the api mode