ebl Add fix for #1175

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7898 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/patches/testing/2.4.3-update-slots.patch b/bacula/patches/testing/2.4.3-update-slots.patch
new file mode 100644 (file)
index 0000000..bdb7832
--- /dev/null
+++ b/bacula/patches/testing/2.4.3-update-slots.patch
@@ -0,0 +1,55 @@
+
+ This patch corrects a problem when removing a volume from
+ an autochanger and the slot is still empty when running
+ update slots command. #1175
+
+ Apply it to version 2.4.3 with:
+
+ cd <bacula-source>
+ patch -p0 <2.4.3-update-slots.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+Index: src/cats/sql_update.c
+===================================================================
+--- src/cats/sql_update.c      (révision 7854)
++++ src/cats/sql_update.c      (copie de travail)
+@@ -445,14 +445,28 @@
+ db_make_inchanger_unique(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
+ {
+    char ed1[50], ed2[50];
+-   if (mr->InChanger != 0 && mr->Slot != 0 && mr->StorageId != 0 &&
+-       mr->MediaId != 0) {
+-      Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0 WHERE "
+-           "Slot=%d AND StorageId=%s AND MediaId!=%s",
+-            mr->Slot, 
+-            edit_int64(mr->StorageId, ed1), edit_int64(mr->MediaId, ed2));
+-      Dmsg1(400, "%s\n", mdb->cmd);
+-      UPDATE_DB(jcr, mdb, mdb->cmd);
++   if (mr->InChanger != 0 && mr->Slot != 0 && mr->StorageId != 0) {
++
++       if (mr->MediaId != 0) {
++          Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0 WHERE "
++               "Slot=%d AND StorageId=%s AND MediaId!=%s",
++               mr->Slot, 
++               edit_int64(mr->StorageId, ed1), edit_int64(mr->MediaId, ed2));
++
++       } else if (*mr->VolumeName) {
++          Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0 WHERE "
++               "Slot=%d AND StorageId=%s AND VolumeName!='%s'",
++               mr->Slot, 
++               edit_int64(mr->StorageId, ed1), mr->VolumeName);
++
++       } else {  /* used by ua_label to reset all volume with this slot */
++          Mmsg(mdb->cmd, "UPDATE Media SET InChanger=0 WHERE "
++               "Slot=%d AND StorageId=%s",
++               mr->Slot, 
++               edit_int64(mr->StorageId, ed1), mr->VolumeName);          
++       }
++       Dmsg1(100, "%s\n", mdb->cmd);
++       UPDATE_DB(jcr, mdb, mdb->cmd);
+    }
+ }
+