Fix DIR - SD use storage protocol

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

diff --git a/bacula/src/dird/msgchan.c b/bacula/src/dird/msgchan.c
index 28edd03599dc527686b7048b118e5574f0023113..e35a5a46fc3e64dc26d1e1b1c81d070fd7cadeba 100644 (file)
--- a/bacula/src/dird/msgchan.c
+++ b/bacula/src/dird/msgchan.c
@@ -204,7 +204,8 @@ int start_storage_daemon_job(JCR *jcr, alist *store, int append)
          bnet_fsend(sd, use_device, device_name.c_str());
          Dmsg1(100, ">stored: %s", sd->msg);
       }
-      bnet_sig(sd, BNET_EOD);
+      bnet_sig(sd, BNET_EOD);            /* end of Devices */
+      bnet_sig(sd, BNET_EOD);            /* end of Storages */
       if (bget_dirmsg(sd) > 0) {
          Dmsg1(100, "<stored: %s", sd->msg);
          /* ****FIXME**** save actual device name */

diff --git a/bacula/src/stored/job.c b/bacula/src/stored/job.c
index c77d95016844fab60565b8907053bb0bb5af4768..404970bb2a8e2f1b59581f44c1086c869ef2dad0 100644 (file)
--- a/bacula/src/stored/job.c
+++ b/bacula/src/stored/job.c
@@ -304,9 +304,12 @@ static bool use_storage_cmd(JCR *jcr)
       if (!ok) {
          return false;
       }
-      /* Eat to BNET_EOD */
+      /* Eat to BNET_EOD -- end of Devices */
       while (bnet_recv(dir) > 0) {
       }
+      /* Eat to end of Devices */
+      while (bnet_recv(dir) > 0) {         
+      }
       LockRes();
       foreach_res(device, R_DEVICE) {
          /* Find resource, and make sure we were able to open it */