Apply scanvolume patch from Richard Mortimer that fixes bug #738

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

diff --git a/bacula/src/stored/scan.c b/bacula/src/stored/scan.c
index 809da6b297c7b37fb73917d559627552a37f1569..137cc9167027eac2473dd978f47d93967e07b1a6 100644 (file)
--- a/bacula/src/stored/scan.c
+++ b/bacula/src/stored/scan.c
@@ -56,8 +56,10 @@ bool DEVICE::scan_dir_for_volume(DCR *dcr)
    bool need_slash = false;
    int len;
 
-   
+   dcrVolCatInfo = dcr->VolCatInfo;     /* structure assignment */
+   devVolCatInfo = VolCatInfo;          /* structure assignment */
    bstrncpy(VolumeName, dcr->VolumeName, sizeof(VolumeName));
+
    name_max = pathconf(".", _PC_NAME_MAX);
    if (name_max < 1024) {
       name_max = 1024;
@@ -113,9 +115,6 @@ bool DEVICE::scan_dir_for_volume(DCR *dcr)
        *  this volume is really OK. If not, put back the desired
        *  volume name, mark it not in changer and continue.
        */
-      dcrVolCatInfo = dcr->VolCatInfo;     /* structure assignment */
-      devVolCatInfo = VolCatInfo;          /* structure assignment */
-      bstrncpy(VolumeName, dcr->VolumeName, sizeof(VolumeName));
       /* Check if this is a valid Volume in the pool */
       bstrncpy(dcr->VolumeName, result->d_name, sizeof(dcr->VolumeName));
       if (!dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) {
@@ -135,6 +134,8 @@ get_out:
    if (!found) {
       /* Restore VolumeName we really wanted */
       bstrncpy(dcr->VolumeName, VolumeName, sizeof(dcr->VolumeName));
+      dcr->VolCatInfo = dcrVolCatInfo;     /* structure assignment */
+      VolCatInfo = devVolCatInfo;          /* structure assignment */
    }
    sm_check(__FILE__, __LINE__, false);
    return found;

diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index 835057dfd823fc35340268344116ed960ddc4792..338177cd144fcfce2764329dcd20668a1a9ef50f 100644 (file)
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -1,6 +1,10 @@
               Technical notes on version 1.39  
 
 General:
+22Dec06
+kes  Apply scanvolume patch from Richard Mortimer that fixes bug
+     #738.
+
 Version 1.39.32 released: 
 20Dec06
 kes  Take first catalog if gui is set, or if using dotcmd.