Add new 1.36.2 patch

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

diff --git a/bacula/patches/1.36.2-store.patch b/bacula/patches/1.36.2-store.patch
new file mode 100644 (file)
index 0000000..4bf000c
--- /dev/null
+++ b/bacula/patches/1.36.2-store.patch
@@ -0,0 +1,29 @@
+
+ This patch fails a job if no Storage resource is specified and
+ the job attempts to call the SD.
+
+ Apply the patch to 1.36.2 with:
+
+ cd <bacula-source>
+ patch -p0 <1.36.2-store.patch
+ make
+ ...
+
+Index: src/dird/msgchan.c
+===================================================================
+RCS file: /cvsroot/bacula/bacula/src/dird/msgchan.c,v
+retrieving revision 1.32.4.1
+diff -u -r1.32.4.1 msgchan.c
+--- src/dird/msgchan.c 14 Feb 2005 10:02:21 -0000      1.32.4.1
++++ src/dird/msgchan.c 18 Mar 2005 15:40:53 -0000
+@@ -66,6 +66,10 @@
+    BSOCK *sd;
+    STORE *store;
+ 
++   if (!jcr->storage[0]) {
++      Jmsg(jcr, M_FATAL, 0, _("Attempt to contact the Storage daemon with no Storage resource.\n"));
++      return false;
++   }
+    store = (STORE *)jcr->storage[0]->first();
+ 
+    /*

diff --git a/bacula/patches/1.36.2-win32-drive.patch b/bacula/patches/1.36.2-win32-drive.patch
index f9623ffbb29086891f1f1f35df8cda5c434073ed..373f04ee6e201859ea7d84d32ec79e5e94c0d97f 100644 (file)
--- a/bacula/patches/1.36.2-win32-drive.patch
+++ b/bacula/patches/1.36.2-win32-drive.patch
@@ -23,7 +23,7 @@ diff -u -r1.34 create_file.c
            be.set_errno(bfd->berrno);
 +#ifdef HAVE_WIN32
 +          /* Check for trying to create a drive, if so, skip */
-+            if (attr->ofname[1] == ':' && attr->ofname[2] = '/' && attr->ofname[3] == 0) {
++            if (attr->ofname[1] == ':' && attr->ofname[2] == '/' && attr->ofname[3] == 0) {
 +             return CF_SKIP;
 +          }
 +#endif

diff --git a/bacula/patches/patches-1.36.2 b/bacula/patches/patches-1.36.2
index 75312c1905e117a23a8be6e6a301a0d83f0da027..0c33591f650caad609df79a94821d56181c47354 100644 (file)
--- a/bacula/patches/patches-1.36.2
+++ b/bacula/patches/patches-1.36.2
@@ -30,4 +30,8 @@
  introduction of the bug was caused by a patch that fixed 
  Bacula truncating tapes after a restore.
  Note that all source files will be rebuilt during the make.
+   
 
+18Mar05 1.36.2-store.patch
+ This patch fails a job if no Storage resource is specified and
+ the job attempts to call the SD.