ebl fix #946 about config test mode which was broken.

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

diff --git a/bacula/patches/testing/eblstodo b/bacula/patches/testing/eblstodo
index ff8f19021d52860bf689f8a3a741243ae14b66ef..5ec22eab423772c4cedb1269ddb6c749176babd3 100644 (file)
--- a/bacula/patches/testing/eblstodo
+++ b/bacula/patches/testing/eblstodo
@@ -124,6 +124,7 @@ bacula :
    o pb inclusion (distante, locale)
    o pb exclusion (distante, locale)
    o pb execution de commande
+   o pb de config avec test du -t des differents daemon
  - Utiliser PQescapeStringConn a la place de PQescapeString
  - Utiliser la lib pcre
  - Rendre les scripts bacula-ctl-xxx LSB

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index d34acd8efbbc1cb7b69033d8606160c9db3d88c7..2b30c065c56ad5418703b5694ff829f14bbfcdee 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -228,15 +228,17 @@ int main (int argc, char *argv[])
       Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
    }
 
-   if (background) {
-      daemon_start();
-      init_stack_dump();              /* grab new pid */
+   if (!test_config) {                /* we don't need to do this block in test mode */
+      if (background) {
+         daemon_start();
+         init_stack_dump();              /* grab new pid */
+      }
+   
+      /* Create pid must come after we are a daemon -- so we have our final pid */
+      create_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
+      read_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
    }
 
-   /* Create pid must come after we are a daemon -- so we have our final pid */
-   create_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
-   read_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
-
    drop(uid, gid);                    /* reduce privileges if requested */
 
    if (!check_catalog()) {

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 4ff42e2a9cb6e26717eb39d4cbe7df9cc47b70d4..b96674ebe155f53792dfeefa6f578cb8df6f176a 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -1,6 +1,9 @@
               Technical notes on version 2.3
 
 General:
+11Sep07 
+ebl  Fix bug #946 about "bacula-dir -t" witch doesn't works
+     as expected.
 09Sep07 
 ebl  Using "m" in bconsole will show messages like before,
      and not memory usage.