Fix reload bug that reset StorageId to zero.

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

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 6f92ba9aeb0d4dd1939923890b531d647f84dad8..10e8c96f9505b6a36d86e62ee5511b40a90879c4 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -123,8 +123,8 @@ int main (int argc, char *argv[])
 {
    int ch;
    JCR *jcr;
-   int no_signals = FALSE;
-   int test_config = FALSE;
+   bool no_signals = false;
+   bool test_config = false;
    char *uid = NULL;
    char *gid = NULL;
 
@@ -174,11 +174,11 @@ int main (int argc, char *argv[])
          break;
 
       case 's':                    /* turn off signals */
-         no_signals = TRUE;
+         no_signals = true;
          break;
 
       case 't':                    /* test config */
-         test_config = TRUE;
+         test_config = true;
          break;
 
       case 'u':                    /* set uid */
@@ -468,7 +468,7 @@ void reload_config(int sig)
    ok = parse_config(configfile, 0, M_ERROR);  /* no exit on error */
 
    Dmsg0(100, "Reloaded config file\n");
-   if (!ok || !check_resources()) {
+   if (!ok || !check_resources() || !check_catalog()) {
       rtable = find_free_reload_table_entry();    /* save new, bad table */
       if (rtable < 0) {
          Jmsg(NULL, M_ERROR, 0, _("Please correct configuration file: %s\n"), configfile);

diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index c0e25ad5174600028dee94a38d75b659ae77bf26..1076b65f5773707a7747a13fe2b58f491ce9a116 100644 (file)
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -106,3 +106,5 @@ SOURCES += joblog/joblog.cpp
 
 INSTALLS += bins
 INSTALLS += confs
+
+QMAKE_EXTRA_TARGETS += depend

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 1dd6eb5072140f472a3bb4389f3f98233532dfd6..70a4f489b353f0ff5c04bbb51bac26ad2bb2b063 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.1.11"
-#define BDATE   "25 May 2007"
-#define LSMDATE "25May07"
+#define BDATE   "26 May 2007"
+#define LSMDATE "26May07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 8c7817b70d07e828ec4cfe2d72e26435fcc7343e..51cf119b2a6088475460bf294ca493187f8eee37 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,8 @@
               Technical notes on version 2.1
 
 General:
+26May07
+kes  Fix reload bug that reset StorageId to zero.
 25May07
 kes  Fix TLS #ifdefing when TLS turned off.
 kes  Ensure that when labelling a tape with Slot=0 that InChanger