kes Fix bad return in FD when encryption signature not found.

[bacula/bacula] / bacula / src / stored / reserve.c

diff --git a/bacula/src/stored/reserve.c b/bacula/src/stored/reserve.c
index 17a74d7d598263604263f5e45698c8832ada7fb4..c27bb08f7eaf5d861eaed23d647dbb2fdeadd617 100644 (file)
--- a/bacula/src/stored/reserve.c
+++ b/bacula/src/stored/reserve.c
@@ -818,20 +818,20 @@ static bool is_vol_in_autochanger(RCTX &rctx, VOLRES *vol)
    Dmsg2(dbglvl, "jid=%u search changers for %s\n", (int)rctx.jcr->JobId, 
          rctx.device_name);
    foreach_res(changer, R_AUTOCHANGER) {
-      Dmsg2(dbglvl, "jid=%u Try match changer res=%s\n", 
-            (int)rctx.jcr->JobId, changer->hdr.name);
+      Dmsg3(dbglvl, "jid=%u Try match changer res=%s device=%s\n", 
+            (int)rctx.jcr->JobId, changer->hdr.name, rctx.device_name);
       /* Find resource, and make sure we were able to open it */
       if (fnmatch(rctx.device_name, changer->hdr.name, 0) == 0) {
          DEVRES *device;
          /* Try each device in this AutoChanger */
          foreach_alist(device, changer->device) {
-            Dmsg2(dbglvl, "jid=%u Try changer device %s\n", 
-                  (int)rctx.jcr->JobId, device->hdr.name);
             if (device->dev == vol->dev) {
                Dmsg2(dbglvl, "jid=%u Found changer device %s\n",
                      (int)rctx.jcr->JobId, device->hdr.name);
                return true;
             }
+            Dmsg2(dbglvl, "jid=%u Incorrect changer device %s\n", 
+                  (int)rctx.jcr->JobId, device->hdr.name);
          }
       }
    }
@@ -919,7 +919,9 @@ bool find_suitable_device_for_job(JCR *jcr, RCTX &rctx)
                rctx.device_name = device_name;
                rctx.device = vol->dev->device;
 
-               if (!vol->dev->is_autochanger()) {
+               if (vol->dev->is_autochanger()) {
+                  Dmsg2(dbglvl, "jid=%u vol=%s is in changer\n", (int)rctx.jcr->JobId, 
+                        vol->vol_name);
                   if (!is_vol_in_autochanger(rctx, vol)) {
                      continue;
                   }