kes Modify winbacula.nsi to substitute with g bin_dir_cmd. Should fix

     bug #742.
09Jan06
kes  Modify USTORE constructor to set an empty store_source string,
     and don't copy the store_source string in a cancel.  Hopefully
     this will fix Arno's seg fault, bug #744.
kes  Add back code to disable conio in configure. Fixes bug #743.
kes  Correct the Options scanner in the FD to correctly handle
     SHA1 option, which was eating the next option.  Reported by
     Sebastien Guilbaud.
kes  Add code to indicate when the SD is spooling, spool wait, and
     despooling as requested by Alan Brown.

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 673c9f8b837e6c8f4173e372acfd703047b3ffe1..c83dc14ef5d4948c597a9c0f50f2250254e7d60f 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -452,6 +452,19 @@ else
 fi
 AC_SUBST(STORED_DIR)
 
+# ---------------------------------------------------
+# Check for conio (Bacula readline substitute)(
+# ---------------------------------------------------
+# this allows you to turn it completely off
+AC_ARG_ENABLE(conio,
+  [ --disable-conio disable conio support [enabled]
+                                             ],
+  [if test x$enableval = xno; then
+     support_conio=no
+  fi]
+)
+  
+
 # ---------------------------------------------------
 # Check for IPv6 support
 # ---------------------------------------------------

diff --git a/bacula/configure b/bacula/configure
index e1e4c83aeeeacb08cf2e8c1991e23791bbdcde1d..3527148ab34718547bc7f4e4404cb452d4ff0b20 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -1439,6 +1439,8 @@ Optional Features:
   --enable-client-only    build client (File daemon) only disabled
   --enable-build-dird     enable building of dird (Director) enabled
   --enable-build-stored   enable building of stored (Storage daemon) enabled
+ --disable-conio disable conio support enabled
+
   --enable-ipv6                    enable ipv6 support enabled
 
   --disable-readline      disable readline support disable
@@ -14899,6 +14901,20 @@ else
 fi
 
 
+# ---------------------------------------------------
+# Check for conio (Bacula readline substitute)(
+# ---------------------------------------------------
+# this allows you to turn it completely off
+# Check whether --enable-conio was given.
+if test "${enable_conio+set}" = set; then
+  enableval=$enable_conio; if test x$enableval = xno; then
+     support_conio=no
+  fi
+
+fi
+
+
+
 # ---------------------------------------------------
 # Check for IPv6 support
 # ---------------------------------------------------

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index ac4cfa109e78689f812f396e3e68190b0e4cf6cf..020a086ffe1230cdf83c3406cfcbd7dde8d6a874 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -318,7 +318,8 @@ public:
    POOLMEM *store_source;
 
    /* Methods */
-   USTORE() { store = NULL; store_source = get_pool_memory(PM_MESSAGE); }
+   USTORE() { store = NULL; store_source = get_pool_memory(PM_MESSAGE); 
+              *store_source = 0; };
    ~USTORE() { destroy(); }   
    void set_source(const char *where);
    void destroy();

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index e715d0edced31b3eb9d04a88245a69eaef74a15a..ebcd832ba6cd1a528244a13a877748d603129782 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -399,10 +399,8 @@ bool cancel_job(UAContext *ua, JCR *jcr)
             USTORE store;
             if (jcr->rstorage) {
                store.store = jcr->rstore;
-               pm_strcpy(store.store_source, jcr->rstore_source);
             } else {
                store.store = jcr->wstore;
-               pm_strcpy(store.store_source, jcr->wstore_source);
             }
             set_wstorage(ua->jcr, &store);
          }

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index dbec9bd976120dad2292dc868ba4b2a93720d475..51f8afcedce64bc32f294a4a7799a7fbbdc4b42c 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -676,6 +676,7 @@ static void add_fileset(JCR *jcr, const char *item)
 
    /* Skip all lines we receive after an error */
    if (state == state_error) {
+      Dmsg0(100, "State=error return\n");
       return;
    }
 
@@ -687,6 +688,7 @@ static void add_fileset(JCR *jcr, const char *item)
     */
    if (subcode != ' ') {
       state = state_error;
+      Dmsg0(100, "Set state=error\n"); 
    }
    switch (code) {
    case 'I':
@@ -942,10 +944,6 @@ static void set_options(findFOPTS *fo, const char *opts)
          break;
       case 'S':
          switch(*(p + 1)) {
-         case ' ':
-            /* Old director did not specify SHA variant */
-            fo->flags |= FO_SHA1;
-            break;
          case '1':
             fo->flags |= FO_SHA1;
             p++;
@@ -961,10 +959,14 @@ static void set_options(findFOPTS *fo, const char *opts)
             break;
 #endif
          default:
-            /* Automatically downgrade to SHA-1 if an unsupported
-             * SHA variant is specified */
+            /*
+             * If 2 or 3 is seen here, SHA2 is not configured, so
+             *  eat the option, and drop back to SHA-1.
+             */
+            if (p[1] == '2' || p[1] == '3') {
+               p++;
+            }
             fo->flags |= FO_SHA1;
-            p++;
             break;
          }
          break;
@@ -999,7 +1001,6 @@ static void set_options(findFOPTS *fo, const char *opts)
       case 'Z':                 /* gzip compression */
          fo->flags |= FO_GZIP;
          fo->GZIP_level = *++p - '0';
-         Dmsg1(200, "Compression level=%d\n", fo->GZIP_level);
          break;
       case 'K':
          fo->flags |= FO_NOATIME;

diff --git a/bacula/src/findlib/match.c b/bacula/src/findlib/match.c
index 90b9041aea393b5a8b8ec405c9b5d1310677e211..e08c863fdf72059788673f8d63bac7a4e93395b7 100644 (file)
--- a/bacula/src/findlib/match.c
+++ b/bacula/src/findlib/match.c
@@ -245,7 +245,8 @@ void add_fname_to_include_list(FF_PKT *ff, int prefixed, const char *fname)
          { }
       next->next = inc;
    }
-   Dmsg1(50, "add_fname_to_include fname=%s\n", inc->fname);
+   Dmsg3(00, "add_fname_to_include prefix=%d gzip=%d fname=%s\n", 
+         prefixed, !!(inc->options & FO_GZIP), inc->fname);
 }
 
 /*

diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index e4fb7d6487e9f52853e2d5e3bde3974cd3a26078..aaf4dcb18da9c03628416217ee0cd42c71fa2e41 100644 (file)
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -389,6 +389,9 @@ static void list_running_jobs(void sendit(const char *msg, int len, void *sarg),
                    dcr->dev?dcr->dev->print_name(): 
                             dcr->device->device_name);
             sendit(msg, len, arg);
+            len= Mmsg(msg, _("    spooling=%d despooling=%d despool_wait=%d\n"),
+                   dcr->spooling, dcr->despooling, dcr->despool_wait);
+            sendit(msg, len, arg);
          }
          sec = time(NULL) - jcr->run_time;
          if (sec <= 0) {

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 0f86eebf07442fab161a68382d368e33329f3dd1..0415af1dcd2a8f65f3240a0d0d7a2d706437fc08 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.0.0"
-#define BDATE   "04 January 2007"
-#define LSMDATE "04Jan07"
+#define VERSION "2.0.1"
+#define BDATE   "12 January 2007"
+#define LSMDATE "12Jan07"
 
 #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/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index aaa57fe0454751c28d2e7590a1788c3f7399cf95..861e95884e2462ae34f93a1ad483fd4296fbdb2b 100644 (file)
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -442,7 +442,7 @@ Section "-Initialize"
   ${StrRep} $R2 "$INSTDIR\bin" "\" "\\\\"
   FileWrite $R1 's;@bin_dir@;$R2;$\r$\n'
   ${StrRep} $R2 "$INSTDIR\bin" "\" "\\"
-  FileWrite $R1 's;@bin_dir_cmd@;$R2;$\r$\n'
+  FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n'
 
   ${StrRep} $R2 "$INSTDIR" "\" "/"
   FileWrite $R1 "s;@BUILD_DIR@;$R2;$\r$\n"

diff --git a/bacula/technotes-2.0 b/bacula/technotes-2.0
new file mode 100644 (file)
index 0000000..9c7a506
--- /dev/null
+++ b/bacula/technotes-2.0
@@ -0,0 +1,19 @@
+              Technical notes on version 2.0
+
+General:
+Version 2.0.1
+11Jan06
+kes  Modify winbacula.nsi to substitute with g bin_dir_cmd. Should fix
+     bug #742.
+09Jan06
+kes  Modify USTORE constructor to set an empty store_source string, 
+     and don't copy the store_source string in a cancel.  Hopefully
+     this will fix Arno's seg fault, bug #744.
+kes  Add back code to disable conio in configure. Fixes bug #743.
+kes  Correct the Options scanner in the FD to correctly handle  
+     SHA1 option, which was eating the next option.  Reported by    
+     Sebastien Guilbaud.
+kes  Add code to indicate when the SD is spooling, spool wait, and 
+     despooling as requested by Alan Brown.
+
+Version 2.0.0 released: 4 January 2007