From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 27 May 2010 20:41:12 +0000 (+0200)
Subject: Fix bug #1581 ASSERTs in src/dird/jobq.c can never trigger
X-Git-Tag: Release-7.0.0~1796
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8b6e380f2d337555fef9d50b7d2e7a249817d7a7;p=bacula%2Fbacula

Fix bug #1581 ASSERTs in src/dird/jobq.c can never trigger
---

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index cf82a7ee8a..754b6dbb5d 100644
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -258,8 +258,8 @@ public:
    char *address;
    char *password;
    CAT *catalog;                      /* Catalog resource */
-   uint32_t MaxConcurrentJobs;        /* Maximume concurrent jobs */
-   uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
+   int32_t MaxConcurrentJobs;         /* Maximum concurrent jobs */
+   int32_t NumConcurrentJobs;         /* number of concurrent jobs running */
    char *tls_ca_certfile;             /* TLS CA Certificate File */
    char *tls_ca_certdir;              /* TLS CA Certificate Directory */
    char *tls_certfile;                /* TLS Client Certificate File */
@@ -292,9 +292,9 @@ public:
    char *password;
    char *media_type;
    alist *device;                     /* Alternate devices for this Storage */
-   uint32_t MaxConcurrentJobs;        /* Maximume concurrent jobs */
-   uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
-   uint32_t NumConcurrentReadJobs;    /* number of jobs reading */
+   int32_t MaxConcurrentJobs;         /* Maximum concurrent jobs */
+   int32_t NumConcurrentJobs;         /* number of concurrent jobs running */
+   int32_t NumConcurrentReadJobs;     /* number of jobs reading */
    char *tls_ca_certfile;             /* TLS CA Certificate File */
    char *tls_ca_certdir;              /* TLS CA Certificate Directory */
    char *tls_certfile;                /* TLS Client Certificate File */
@@ -397,8 +397,8 @@ public:
    utime_t MaxDiffInterval;           /* Maximum time interval between Diffs */
    utime_t DuplicateJobProximity;     /* Permitted time between duplicicates */
    int64_t spool_size;                /* Size of spool file for this job */
-   uint32_t MaxConcurrentJobs;        /* Maximum concurrent jobs */
-   uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
+   int32_t MaxConcurrentJobs;         /* Maximum concurrent jobs */
+   int32_t NumConcurrentJobs;         /* number of concurrent jobs running */
    bool allow_mixed_priority;         /* Allow jobs with higher priority concurrently with this */
 
    MSGS      *messages;               /* How and where to send messages */