Fix scanf of PoolId in catreq to handle 64 bit Ids.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1882 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/catreq.c b/bacula/src/dird/catreq.c
index 6df8db94fe382a38eb0b6583392f8414154ac155..44d26831684afce98c3634996a90d60145e3b191 100644 (file)
--- a/bacula/src/dird/catreq.c
+++ b/bacula/src/dird/catreq.c
@@ -95,6 +95,7 @@ void catalog_request(JCR *jcr, BSOCK *bs, char *msg)
    MEDIA_DBR mr, sdmr;
    JOBMEDIA_DBR jm;
    char Job[MAX_NAME_LENGTH];
+   int64_t PoolId;
    int index, ok, label, writing;
    POOLMEM *omsg;
 
@@ -117,7 +118,8 @@ void catalog_request(JCR *jcr, BSOCK *bs, char *msg)
    /*
     * Find next appendable medium for SD
     */
-   if (sscanf(bs->msg, Find_media, &Job, &index, &mr.PoolId) == 3) {
+   if (sscanf(bs->msg, Find_media, &Job, &index, &PoolId) == 3) {
+      mr.PoolId = PoolId;
       ok = find_next_volume_for_append(jcr, &mr, true /*permit create new vol*/);
       /*
        * Send Find Media response to Storage daemon

diff --git a/bacula/src/dird/getmsg.c b/bacula/src/dird/getmsg.c
index ae961f30118935a47d931b502bd14d53325f606c..c50956258e4cf6796c3775fb1cf4825255d5ed05 100644 (file)
--- a/bacula/src/dird/getmsg.c
+++ b/bacula/src/dird/getmsg.c
@@ -96,7 +96,7 @@ int bget_dirmsg(BSOCK *bs)
 
    for (;;) {
       n = bnet_recv(bs);
-      Dmsg2(900, "bget_dirmsg %d: %s\n", n, bs->msg);
+      Dmsg2(900, "bget_dirmsg %d: %s", n, bs->msg);
 
       if (is_bnet_stop(bs)) {
         return n;                    /* error or terminate */

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index d86280278cfbd0f9cdefb03eb5bea9f62fe6e23f..65079394b2f2ad0db917b7543ff2c2e01a72a27a 100755 (executable)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -570,7 +570,7 @@ void dispatch_message(JCR *jcr, int type, time_t mtime, char *msg)
     MSGS *msgs;
     BPIPE *bpipe;
 
-    Dmsg2(850, "Enter dispatch_msg type=%d msg=%s\n", type, msg);
+    Dmsg2(850, "Enter dispatch_msg type=%d msg=%s", type, msg);
 
     /*
      * Most messages are prefixed by a date and time. If mtime is

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 780da7da6322975be5afcdbd2c02e4d2d86e945f..a6797f12ad1e91fc75375625ab9d4fbd23e1e211 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.6"
-#define BDATE   "10 March 2005"
-#define LSMDATE "10Mar05"
+#define BDATE   "11 March 2005"
+#define LSMDATE "11Mar05"
 
 /* Debug flags */
 #undef  DEBUG