From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 20 Feb 2009 08:24:27 +0000 (+0000)
Subject: ebl  Fix #1233
X-Git-Tag: Release-7.0.0~3360
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c0e8c877ef1c51f46bedb1a70c4a7774ef8e6eb9;p=bacula%2Fbacula

ebl  Fix #1233


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

diff --git a/bacula/patches/testing/fix_1233_bootstrap_name.patch b/bacula/patches/testing/fix_1233_bootstrap_name.patch
new file mode 100644
index 0000000000..35d26d8b00
--- /dev/null
+++ b/bacula/patches/testing/fix_1233_bootstrap_name.patch
@@ -0,0 +1,40 @@
+ This patch fixes a bootstrap creation file problem when
+ all daemons have the same name. It fixes bug #1233.
+
+ Apply it to trunk with:
+
+ cd <bacula-source>
+ patch -p0 < fix_1233_bootstrap_name.patch
+ ./configure <your options>
+ make
+ ...
+ make install
+
+
+
+Index: src/filed/job.c
+===================================================================
+--- src/filed/job.c	(révision 8483)
++++ src/filed/job.c	(copie de travail)
+@@ -1190,7 +1190,7 @@
+    free_bootstrap(jcr);
+    P(bsr_mutex);
+    bsr_uniq++;
+-   Mmsg(fname, "%s/%s.%s.%d.bootstrap", me->working_directory, me->hdr.name,
++   Mmsg(fname, "%s/%s.%s.%d.fd.bootstrap", me->working_directory, me->hdr.name,
+       jcr->Job, bsr_uniq);
+    V(bsr_mutex);
+    Dmsg1(400, "bootstrap=%s\n", fname);
+Index: src/stored/fd_cmds.c
+===================================================================
+--- src/stored/fd_cmds.c	(révision 8483)
++++ src/stored/fd_cmds.c	(copie de travail)
+@@ -344,7 +344,7 @@
+    }
+    P(bsr_mutex);
+    bsr_uniq++;
+-   Mmsg(fname, "%s/%s.%s.%d.bootstrap", me->working_directory, me->hdr.name,
++   Mmsg(fname, "%s/%s.%s.%d.sd.bootstrap", me->working_directory, me->hdr.name,
+       jcr->Job, bsr_uniq);
+    V(bsr_mutex);
+    Dmsg1(400, "bootstrap=%s\n", fname);