From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 4 Oct 2018 09:37:30 +0000 (+0200)
Subject: Fix incorrectly indicating: malformed message
X-Git-Tag: Release-9.2.2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5037a5481d4ff0e277d497e14f1d8992baad270;p=thirdparty%2Fbacula.git

Fix incorrectly indicating: malformed message
---

diff --git a/bacula/src/dird/getmsg.c b/bacula/src/dird/getmsg.c
index 18b54e961..1fc42215d 100644
--- a/bacula/src/dird/getmsg.c
+++ b/bacula/src/dird/getmsg.c
@@ -203,7 +203,7 @@ int bget_dirmsg(BSOCK *bs)
       if ((sscanf(bs->msg, "%020s JobId=%ld ", MsgType, &JobId) != 2) &&
           (sscanf(bs->msg, "%020s Job=%127s ", MsgType, Job) != 2) &&
           (sscanf(bs->msg, "%020s Job=x", MsgType) != 1)) {
-         if (is_msgid(strchr(bs->msg, '['))) {
+         if (jcr->JobId == 0 || is_msgid(strchr(bs->msg, '['))) {
             return n;
          }
          Jmsg1(jcr, M_ERROR, 0, _("Malformed message: %s\n"), bs->msg);
@@ -212,6 +212,9 @@ int bget_dirmsg(BSOCK *bs)
 
       /* Skip past first two fields: "Jmsg JobId=nnn" */
       if (!(msg=find_msg_start(bs->msg))) {
+         if (jcr->JobId == 0) {
+            return n;
+         }
          Jmsg1(jcr, M_ERROR, 0, _("Malformed message: %s\n"), bs->msg);
          continue;
       }