Additional message plus exclusion fix

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

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index 1f9dfe812f1d2e39291945b2426ee7b7e8620308..e3a51fbc2da556043be8c972368758ec579b2e7b 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -98,7 +98,7 @@ static int do_request_volume_info(JCR *jcr)
     strcpy(jcr->VolumeName, vol->VolCatName); /* set desired VolumeName */
     
     Dmsg2(200, "do_reqest_vol_info got slot=%d Volume=%s\n", 
-       vol->Slot, vol->VolCatName);
+         vol->Slot, vol->VolCatName);
     return 1;
 }
 
@@ -158,6 +158,7 @@ int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel)
       Jmsg0(jcr, M_ERROR, 0, _("NULL Volume name. This shouldn't happen!!!\n"));
       return 0;
    }
+   bash_spaces(vol->VolCatName);
    bnet_fsend(dir, Update_media, jcr->Job, 
       vol->VolCatName, vol->VolCatJobs, vol->VolCatFiles,
       vol->VolCatBlocks, edit_uint64(vol->VolCatBytes, ed1),
@@ -165,6 +166,7 @@ int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel)
       vol->VolCatWrites, edit_uint64(vol->VolCatMaxBytes, ed2), 
       EndTime, vol->VolCatStatus, vol->Slot, relabel);
    Dmsg1(120, "update_volume_data(): %s", dir->msg);
+   unbash_spaces(vol->VolCatName);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "updateVolCatInfo error bnet_recv\n");
       Jmsg(jcr, M_ERROR, 0, _("Error updating Volume Info: %s\n"), 
@@ -280,8 +282,7 @@ int dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev)
          * removable media, return now, otherwise wait
          * for the operator to mount the media.
          */
-        if (jcr->VolumeName[0] && !(dev->capabilities & CAP_REM) &&      
-             dev->capabilities & CAP_LABEL) {
+        if (jcr->VolumeName[0] && !dev_cap(dev, CAP_REM) && dev_cap(dev, CAP_LABEL)) {
             Dmsg0(190, "Return 1 from mount without wait.\n");
            return 1;
         }