- Modified detection of largefiles to always set all flags regardless

  of the machine.
- Modify autostart scripts to start Bacula late in the process and
  terminate it early.
- Drop CDImages table in drop database tables scripts.
- Alter casting of (void *) in gnome2-console/restore.c to pass
  by a (long int) so that it works with 64 bit machines.
- Add more debug to heartbeat.c in FD for problem of dropped connections.

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

diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4
index 1f3cfb8796949951f54d4acb096624df4009cd97..3f05d19f35bbd74bfad925a5d4ecdb8419696b03 100644 (file)
--- a/bacula/autoconf/aclocal.m4
+++ b/bacula/autoconf/aclocal.m4
@@ -6,6 +6,11 @@ dnl For more details about this brain damage please see:
 dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
 
 dnl Written by Paul Eggert <eggert@twinsun.com>.
+dnl 
+dnl Modified by Kern Sibbald to turn on the large file
+dnl   flags on all machines. Otherwise functions such as
+dnl   fseek are not large file capable.
+dnl
 
 dnl Internal subroutine of AC_SYS_LARGEFILE.
 dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
@@ -90,27 +95,15 @@ AC_DEFUN(AC_BAC_LARGEFILE,
      AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS,
        ac_cv_sys_file_offset_bits,
        [Number of bits in a file offset, on hosts where this is settable.],
-       [case "$host_os" in
-        # HP-UX 10.20 and later
-        hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
-          ac_cv_sys_file_offset_bits=64 ;;
-        esac])
+       [ac_cv_sys_file_offset_bits=64])
      AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
        ac_cv_sys_largefile_source,
        [Define to make fseeko etc. visible, on some hosts.],
-       [case "$host_os" in
-        # HP-UX 10.20 and later
-        hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
-          ac_cv_sys_largefile_source=1 ;;
-        esac])
+       [ac_cv_sys_largefile_source=1]) 
      AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
        ac_cv_sys_large_files,
        [Define for large files, on AIX-style hosts.],
-       [case "$host_os" in
-        # AIX 4.2 and later
-        aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
-          ac_cv_sys_large_files=1 ;;
-        esac])
+          [ac_cv_sys_large_files=1])
    fi
   ])
 dnl ==========================================================

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 71fac94f322d776c79d5c330d4732454809a1dd6..56c291608075efd433d44a9f5a48e16dad77f764 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -398,7 +398,7 @@ if test x$support_conio = xyes; then
        ])
      ],
      [
-         AC_CHECK_HEADERS(curses.h)
+        AC_CHECK_HEADERS(curses.h)
         AC_CHECK_HEADER(term.h,
               [ AC_CHECK_LIB(curses, tgetent, 
                 [ CONS_LIBS="-lcurses"
@@ -408,7 +408,7 @@ if test x$support_conio = xyes; then
                   support_readline=no
                   AC_DEFINE(HAVE_CONIO, 1, [Set if Bacula conio support enabled]) 
                 ])
-               ],
+              ],
               [ echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "],
 [#if HAVE_CURSES_H
 #include <curses.h>

diff --git a/bacula/configure b/bacula/configure
index a31ff1092253ad027c1d55d043a7d72e319a340e..f97f4c880d1305552eb1f09bbd64fc8a647cbd2c 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -8261,11 +8261,7 @@ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_sys_file_offset_bits=no
-      case "$host_os" in
-        # HP-UX 10.20 and later
-        hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
-          ac_cv_sys_file_offset_bits=64 ;;
-        esac
+      ac_cv_sys_file_offset_bits=64
       for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
         case "$ac_flag" in
         -D_FILE_OFFSET_BITS)
@@ -8291,11 +8287,7 @@ if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_sys_largefile_source=no
-      case "$host_os" in
-        # HP-UX 10.20 and later
-        hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
-          ac_cv_sys_largefile_source=1 ;;
-        esac
+      ac_cv_sys_largefile_source=1
       for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
         case "$ac_flag" in
         -D_LARGEFILE_SOURCE)
@@ -8321,11 +8313,7 @@ if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_sys_large_files=no
-      case "$host_os" in
-        # AIX 4.2 and later
-        aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
-          ac_cv_sys_large_files=1 ;;
-        esac
+      ac_cv_sys_large_files=1
       for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
         case "$ac_flag" in
         -D_LARGE_FILES)

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 0b440a82898a444e5ee51b391d92132a938987d0..e68648b10c591b01ac75f8a251d479b54d2f29b2 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -16,6 +16,8 @@ Version 1.35                Kern (see below)
   
 
 Maybe for 1.35:
+- Despool attributes simultaneously with data in a separate
+  thread, rejoined at end of data spooling.
 - Implement Files/Bytes,... stats for restore job.
 - Implement Total Bytes Written, ... for restore job.
 - Check dates entered by user for correctness (month/day/... ranges)
@@ -1384,3 +1386,5 @@ Block Position: 0
   scripts to add them.
 - Modify postgresql update script to remove bigint FilenameId           
   reference.
+- Kill daemons at levels in the teens rather than late.
+

diff --git a/bacula/platforms/alpha/bacula-fd.in b/bacula/platforms/alpha/bacula-fd.in
index ebcf572c31e7ce54c1a565217acfab35b1b3623a..c7b5e28f05aafb735bcc42d5a02fc0b17d69b3eb 100644 (file)
--- a/bacula/platforms/alpha/bacula-fd.in
+++ b/bacula/platforms/alpha/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your
 computers.
 #

diff --git a/bacula/platforms/bsdi/bacula-dir.in b/bacula/platforms/bsdi/bacula-dir.in
index 8ff091906e18286124562e6a9690cca0de062423..e7e76b1618a2d83236be04e759a1e62d159e9df1 100755 (executable)
--- a/bacula/platforms/bsdi/bacula-dir.in
+++ b/bacula/platforms/bsdi/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/bsdi/bacula-fd.in b/bacula/platforms/bsdi/bacula-fd.in
index 9f26adea5dcf00e74bbe25e9dec9a9848e0c0c2e..54f17b9a969110148cc13ff009bcddd2be2f8ab1 100755 (executable)
--- a/bacula/platforms/bsdi/bacula-fd.in
+++ b/bacula/platforms/bsdi/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/bsdi/bacula-sd.in b/bacula/platforms/bsdi/bacula-sd.in
index 79e1a91ee6853da80c81744dc11fe4b77027bc6a..fb55fb47cfd009917e53095da9bd389b640f8a95 100755 (executable)
--- a/bacula/platforms/bsdi/bacula-sd.in
+++ b/bacula/platforms/bsdi/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/freebsd/bacula-dir.in b/bacula/platforms/freebsd/bacula-dir.in
index 8ff091906e18286124562e6a9690cca0de062423..e7e76b1618a2d83236be04e759a1e62d159e9df1 100755 (executable)
--- a/bacula/platforms/freebsd/bacula-dir.in
+++ b/bacula/platforms/freebsd/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/freebsd/bacula-fd.in b/bacula/platforms/freebsd/bacula-fd.in
index 9f26adea5dcf00e74bbe25e9dec9a9848e0c0c2e..54f17b9a969110148cc13ff009bcddd2be2f8ab1 100755 (executable)
--- a/bacula/platforms/freebsd/bacula-fd.in
+++ b/bacula/platforms/freebsd/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/freebsd/bacula-sd.in b/bacula/platforms/freebsd/bacula-sd.in
index 79e1a91ee6853da80c81744dc11fe4b77027bc6a..fb55fb47cfd009917e53095da9bd389b640f8a95 100755 (executable)
--- a/bacula/platforms/freebsd/bacula-sd.in
+++ b/bacula/platforms/freebsd/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/gentoo/bacula-dir.in b/bacula/platforms/gentoo/bacula-dir.in
index 915bdbf98a91d51dba6b2eecef6c4e493f7f6e90..9ce3b0b6497100e2a0afba225d27be1d407175d8 100755 (executable)
--- a/bacula/platforms/gentoo/bacula-dir.in
+++ b/bacula/platforms/gentoo/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon for the Gentoo release
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/gentoo/bacula-fd.in b/bacula/platforms/gentoo/bacula-fd.in
index 7de65ef48f63c0ed94145176aa8cb1b859b6a805..67e335ab77e1363d86c7da3b3e05c0e64d30d3ce 100755 (executable)
--- a/bacula/platforms/gentoo/bacula-fd.in
+++ b/bacula/platforms/gentoo/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon for the Gentoo release.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/gentoo/bacula-sd.in b/bacula/platforms/gentoo/bacula-sd.in
index bf6ffd490bb631b41a768cc6d2464f892cc625ef..753416e1147308a871ca25d59d582bf8cb6316c4 100755 (executable)
--- a/bacula/platforms/gentoo/bacula-sd.in
+++ b/bacula/platforms/gentoo/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon for the Gentoo release.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/irix/bacula-dir.in b/bacula/platforms/irix/bacula-dir.in
index 8ff091906e18286124562e6a9690cca0de062423..e7e76b1618a2d83236be04e759a1e62d159e9df1 100755 (executable)
--- a/bacula/platforms/irix/bacula-dir.in
+++ b/bacula/platforms/irix/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/irix/bacula-fd.in b/bacula/platforms/irix/bacula-fd.in
index 2a287e6cc5ce0bf3d8b1bcb945203e979b4d4fcd..d7672d3f51565b837f91b733b4697d5a73261a20 100755 (executable)
--- a/bacula/platforms/irix/bacula-fd.in
+++ b/bacula/platforms/irix/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/irix/bacula-sd.in b/bacula/platforms/irix/bacula-sd.in
index 79e1a91ee6853da80c81744dc11fe4b77027bc6a..fb55fb47cfd009917e53095da9bd389b640f8a95 100755 (executable)
--- a/bacula/platforms/irix/bacula-sd.in
+++ b/bacula/platforms/irix/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/mandrake/bacula-dir.in b/bacula/platforms/mandrake/bacula-dir.in
index d568cdb9993601e05178347728debcded757e060..0f82a1a4a5f6bb5568938047ebc4c81dfb20bced 100755 (executable)
--- a/bacula/platforms/mandrake/bacula-dir.in
+++ b/bacula/platforms/mandrake/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/mandrake/bacula-fd.in b/bacula/platforms/mandrake/bacula-fd.in
index 19f04f028b35d82bf480378100d82adefa260bcb..a6f31e91985a00d0ad57b39103674cb1a5e6e011 100755 (executable)
--- a/bacula/platforms/mandrake/bacula-fd.in
+++ b/bacula/platforms/mandrake/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/mandrake/bacula-sd.in b/bacula/platforms/mandrake/bacula-sd.in
index a4bfdd4f5a47a7964286014c23ea26d0562a2be5..f496b14f882fe114fa40f31c071d00be2c828cc0 100755 (executable)
--- a/bacula/platforms/mandrake/bacula-sd.in
+++ b/bacula/platforms/mandrake/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/openbsd/bacula-dir.in b/bacula/platforms/openbsd/bacula-dir.in
index 8ff091906e18286124562e6a9690cca0de062423..2ae3e5420b579cc0cdf3599d878f4ee96b7b5cec 100755 (executable)
--- a/bacula/platforms/openbsd/bacula-dir.in
+++ b/bacula/platforms/openbsd/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 20 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/openbsd/bacula-fd.in b/bacula/platforms/openbsd/bacula-fd.in
index 9f26adea5dcf00e74bbe25e9dec9a9848e0c0c2e..54f17b9a969110148cc13ff009bcddd2be2f8ab1 100755 (executable)
--- a/bacula/platforms/openbsd/bacula-fd.in
+++ b/bacula/platforms/openbsd/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/openbsd/bacula-sd.in b/bacula/platforms/openbsd/bacula-sd.in
index 79e1a91ee6853da80c81744dc11fe4b77027bc6a..ac869998244b8c966a53fdef72ea18eb313609c8 100755 (executable)
--- a/bacula/platforms/openbsd/bacula-sd.in
+++ b/bacula/platforms/openbsd/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 20 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/redhat/bacula-dir.in b/bacula/platforms/redhat/bacula-dir.in
index 4b5dc8eee2ad6df650f46086038a7b27329f642c..86131c92f58733c96816c444bf7b36707e76d2f8 100755 (executable)
--- a/bacula/platforms/redhat/bacula-dir.in
+++ b/bacula/platforms/redhat/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 92 99
+# chkconfig: 2345 92 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/redhat/bacula-fd.in b/bacula/platforms/redhat/bacula-fd.in
index 1d5a04290110c3ce9c07749f660767159c4a1cba..f288f7d2b6364461a1fc72fd09b4f8514d4eea88 100755 (executable)
--- a/bacula/platforms/redhat/bacula-fd.in
+++ b/bacula/platforms/redhat/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 91 99
+# chkconfig: 2345 91 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/redhat/bacula-sd.in b/bacula/platforms/redhat/bacula-sd.in
index 4ba08f22ff8011fc777b8f0f808ffdc8946ca531..ca8179fb13cf6cd6dbe3b3321677e7a7bf2e6eeb 100755 (executable)
--- a/bacula/platforms/redhat/bacula-sd.in
+++ b/bacula/platforms/redhat/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon.
 #
-# chkconfig: 2345 90 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/solaris/bacula-dir.in b/bacula/platforms/solaris/bacula-dir.in
index 8ff091906e18286124562e6a9690cca0de062423..bd433b162555d73399da9356321a326b3f64e527 100755 (executable)
--- a/bacula/platforms/solaris/bacula-dir.in
+++ b/bacula/platforms/solaris/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 92 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/solaris/bacula-fd.in b/bacula/platforms/solaris/bacula-fd.in
index 9f26adea5dcf00e74bbe25e9dec9a9848e0c0c2e..14160a7643b9a4476a0b307d97608c0e972ea143 100755 (executable)
--- a/bacula/platforms/solaris/bacula-fd.in
+++ b/bacula/platforms/solaris/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 91 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/solaris/bacula-sd.in b/bacula/platforms/solaris/bacula-sd.in
index 79e1a91ee6853da80c81744dc11fe4b77027bc6a..fb55fb47cfd009917e53095da9bd389b640f8a95 100755 (executable)
--- a/bacula/platforms/solaris/bacula-sd.in
+++ b/bacula/platforms/solaris/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon.
 #
-# chkconfig: 2345 20 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@

diff --git a/bacula/platforms/suse/bacula-dir.in b/bacula/platforms/suse/bacula-dir.in
index 8af07e35a01d9e7984d7406c277ab39c732838c8..c4d17bb90395cc04f926ddb0fe8df47c10a78bd9 100755 (executable)
--- a/bacula/platforms/suse/bacula-dir.in
+++ b/bacula/platforms/suse/bacula-dir.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 90 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
@@ -16,7 +16,7 @@
 # Required-Start:              $local_fs $network @DB_NAME@
 # Required-Stop:               $local_fs $network @DB_NAME@
 # Default-Start:               3 5
-# Default-Stop:                0 1 2 6
+# Default-Stop:        0 1 2 6
 # Short-Description:   bacula director
 # Description:                 Bacula network backup system director daemon
 ### END INIT INFO

diff --git a/bacula/platforms/suse/bacula-fd.in b/bacula/platforms/suse/bacula-fd.in
index f868177baf733ff88bf37e5c99e4d95eff412fce..d8363de5f3b0e7a6171ca65d20641082e818648d 100755 (executable)
--- a/bacula/platforms/suse/bacula-fd.in
+++ b/bacula/platforms/suse/bacula-fd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula File daemon.
 #
-# chkconfig: 2345 90 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
@@ -16,7 +16,7 @@
 # Required-Start:              $local_fs $network @DB_NAME@
 # Required-Stop:               $local_fs $network @DB_NAME@
 # Default-Start:               3 5
-# Default-Stop:                0 1 2 6
+# Default-Stop:        0 1 2 6
 # Short-Description:   bacula file daemon
 # Description:                 Bacula network backup system file daemon
 ### END INIT INFO

diff --git a/bacula/platforms/suse/bacula-sd.in b/bacula/platforms/suse/bacula-sd.in
index f0fa5e48279c4930aad6a42ea95e99dee3986fe9..e772cb79e2df0ef432c328a4e0904d9afab745ef 100755 (executable)
--- a/bacula/platforms/suse/bacula-sd.in
+++ b/bacula/platforms/suse/bacula-sd.in
@@ -3,7 +3,7 @@
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Storage daemon.
 #
-# chkconfig: 2345 90 99
+# chkconfig: 2345 90 9
 # description: It comes by night and sucks the vital essence from your computers.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
@@ -16,7 +16,7 @@
 # Required-Start:              $local_fs $network @DB_NAME@
 # Required-Stop:               $local_fs $network @DB_NAME@
 # Default-Start:               3 5
-# Default-Stop:                0 1 2 6
+# Default-Stop:        0 1 2 6
 # Short-Description:   bacula storage daemon
 # Description:                 Bacula network backup system storage daemon
 ### END INIT INFO

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index 726c7ac88066b559083b251a6e0632f7ec2c8ec3..6e2bf2769bb6b6481a2d669c63c00b2c2f014f84 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -45,6 +45,7 @@
 #define _THREAD_SAFE  1
 #define _POSIX_PTHREAD_SEMANTICS 1
 
+
 /* System includes */
 #if HAVE_STDINT_H
 #include <stdint.h>

diff --git a/bacula/src/cats/drop_mysql_tables.in b/bacula/src/cats/drop_mysql_tables.in
index ff97be8fadbfc86af903ac0b69e3eab88bae25e5..3c5fc9aaba11948c37296c9776ad0c45b2f8780a 100644 (file)
--- a/bacula/src/cats/drop_mysql_tables.in
+++ b/bacula/src/cats/drop_mysql_tables.in
@@ -22,6 +22,7 @@ DROP TABLE IF EXISTS Version;
 DROP TABLE IF EXISTS Counters;
 DROP TABLE IF EXISTS BaseFiles;
 DROP TABLE IF EXISTS UnsavedFiles;
+DROP TABLE IF EXISTS CDImages;
 END-OF-DATA
 then
    echo "Deletion of Bacula MySQL tables succeeded."

diff --git a/bacula/src/cats/drop_postgresql_tables.in b/bacula/src/cats/drop_postgresql_tables.in
index f7cf26dda89872c3df94cf2baf637cad1ab14108..35ec37784599c5125bdbfe52766f7ce4e8bc2b74 100644 (file)
--- a/bacula/src/cats/drop_postgresql_tables.in
+++ b/bacula/src/cats/drop_postgresql_tables.in
@@ -19,6 +19,7 @@ drop table path;
 drop table filename;
 drop table counters;
 drop table version;
+drop table CDImages;
 END-OF-DATA
 then
    echo "Deletion of Bacula PostgreSQL tables succeeded."

diff --git a/bacula/src/filed/heartbeat.c b/bacula/src/filed/heartbeat.c
index 0bda4f485cdeaaba185ff77e32c92bc78a55b318..edbad95136fbb0caaa7376d2a2f56319da20b647 100644 (file)
--- a/bacula/src/filed/heartbeat.c
+++ b/bacula/src/filed/heartbeat.c
@@ -69,7 +69,7 @@ extern "C" void *sd_heartbeat_thread(void *arg)
    /* Hang reading the socket to the SD, and every time we get
     *  a heartbeat or we get a wait timeout (1 minute), we
     *  check to see if we need to send a heartbeat to the
-    *  Directory.
+    *  Director.
     */
    for ( ; !is_bnet_stop(sd); ) {
       n = bnet_wait_data_intr(sd, WAIT_INTERVAL);
@@ -82,7 +82,11 @@ extern "C" void *sd_heartbeat_thread(void *arg)
       }
       if (n == 1) {                  /* input waiting */
         bnet_recv(sd);               /* read it -- probably heartbeat from sd */
-         Dmsg1(100, "Got %d from SD\n", sd->msglen);     
+        if (sd->msglen <= 0) {
+            Dmsg1(100, "Got BNET_SIG %d from SD\n", sd->msglen);     
+        } else {
+            Dmsg2(100, "Got %d bytes from SD. MSG=%s\n", sd->msglen, sd->msg);
+        }
       }
    }
    bnet_close(sd);

diff --git a/bacula/src/gnome2-console/restore.c b/bacula/src/gnome2-console/restore.c
index 65e849c2402310166a7dfb179af7410fdf575b46..850c0e88afa6571c281722145d2a3ce6ec5af772 100755 (executable)
--- a/bacula/src/gnome2-console/restore.c
+++ b/bacula/src/gnome2-console/restore.c
@@ -95,7 +95,7 @@ on_restore_add_button_clicked(GtkButton *button, gpointer user_data)
    int row;
 
    for (int i=0; i < num_selected; i++) {
-      row = (int)g_list_nth_data(restore->list->selection, i);
+      row = (int)(long int)g_list_nth_data(restore->list->selection, i);
       mark_row(row, true);
    }
 }
@@ -108,7 +108,7 @@ on_restore_remove_button_clicked(GtkButton *button, gpointer user_data)
    int row;
 
    for (int i=0; i < num_selected; i++) {
-      row = (int)g_list_nth_data(restore->list->selection, i);
+      row = (int)(long int)g_list_nth_data(restore->list->selection, i);
       mark_row(row, false);
    }
 }
@@ -307,11 +307,11 @@ static void select_row_cb(GtkCList *item, gint row, gint column,
         len = strlen(file);
          if (len > 0 && file[len-1] == '/') {
            /* Change to new directory */
-           pm_strcpy(&restore->path, restore->fname);
+           pm_strcpy(restore->path, restore->fname);
             if (*file == '*') {
-               Mmsg(&restore->fname, "%s%s", restore->path, file+1);
+               Mmsg(restore->fname, "%s%s", restore->path, file+1);
            } else {
-               Mmsg(&restore->fname, "%s%s", restore->path, file);
+               Mmsg(restore->fname, "%s%s", restore->path, file);
            }
            FillDirectory(restore->fname, restore);
         }

diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c
index 7f5cdbb4405aeb594afcaa8b83f1b0be8d9ae6a8..54df1e66aae8aae3510de1c08044b95317de31f4 100644 (file)
--- a/bacula/src/lib/bnet.c
+++ b/bacula/src/lib/bnet.c
@@ -162,6 +162,7 @@ int32_t bnet_recv(BSOCK * bsock)
 
    ASSERT(bsock != NULL);
    bsock->msg[0] = 0;
+   bsock->msglen = 0;
    if (bsock->errors || bsock->terminated) {
       return BNET_HARDEOF;
    }

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 2b5cbc5bf5e84fa9e3a6e681f3321dd945ced33d..648d44cab08fb8a5c2520d63e6d37d180efad404 100644 (file)
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -164,7 +164,7 @@ bool do_append_data(JCR *jcr)
       }
       stream = (int32_t)str_to_int64(p);
 
-      Dmsg2(490, "<filed: Header FilInx=%d stream=%d\n", file_index, stream);
+      Dmsg2(890, "<filed: Header FilInx=%d stream=%d\n", file_index, stream);
 
       if (!(file_index > 0 && (file_index == last_file_index ||
          file_index == last_file_index + 1))) {
@@ -188,12 +188,12 @@ bool do_append_data(JCR *jcr)
         rec.data_len = ds->msglen;
         rec.data = ds->msg;            /* use message buffer */
 
-         Dmsg4(450, "before writ_rec FI=%d SessId=%d Strm=%s len=%d\n",
+         Dmsg4(850, "before writ_rec FI=%d SessId=%d Strm=%s len=%d\n",
            rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream,rec.FileIndex), 
            rec.data_len);
          
         while (!write_record_to_block(dcr->block, &rec)) {
-            Dmsg2(650, "!write_record_to_block data_len=%d rem=%d\n", rec.data_len,
+            Dmsg2(850, "!write_record_to_block data_len=%d rem=%d\n", rec.data_len,
                       rec.remainder);
            if (!write_block_to_device(dcr)) {
                Dmsg2(90, "Got write_block_to_dev error on device %s. %s\n",
@@ -209,7 +209,7 @@ bool do_append_data(JCR *jcr)
            break;
         }
         jcr->JobBytes += rec.data_len;   /* increment bytes this job */
-         Dmsg4(350, "write_record FI=%s SessId=%d Strm=%s len=%d\n",
+         Dmsg4(850, "write_record FI=%s SessId=%d Strm=%s len=%d\n",
            FI_to_ascii(rec.FileIndex), rec.VolSessionId, 
            stream_to_ascii(rec.Stream, rec.FileIndex), rec.data_len);
 
@@ -220,7 +220,7 @@ bool do_append_data(JCR *jcr)
               if (are_attributes_spooled(jcr)) {
                  jcr->dir_bsock->spool = true;
               }
-               Dmsg0(350, "Send attributes.\n");
+               Dmsg0(850, "Send attributes to dir.\n");
               if (!dir_update_file_attributes(dcr, &rec)) {
                  jcr->dir_bsock->spool = false;
                   Jmsg(jcr, M_FATAL, 0, _("Error updating file attributes. ERR=%s\n"),

diff --git a/bacula/src/stored/record.c b/bacula/src/stored/record.c
index ce68807165246612fdad1a8e26f22d68d92f49ad..616b068abda2fdfc6f4eb088510c91cdc864eb47 100644 (file)
--- a/bacula/src/stored/record.c
+++ b/bacula/src/stored/record.c
@@ -204,7 +204,7 @@ bool write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec)
    ASSERT(block->binbuf == (uint32_t) (block->bufp - block->buf));
    ASSERT(block->buf_len >= block->binbuf);
 
-   Dmsg6(490, "write_record_to_block() FI=%s SessId=%d Strm=%s len=%d\n\
+   Dmsg6(890, "write_record_to_block() FI=%s SessId=%d Strm=%s len=%d\n\
 rem=%d remainder=%d\n",
       FI_to_ascii(rec->FileIndex), rec->VolSessionId, 
       stream_to_ascii(rec->Stream, rec->FileIndex), rec->data_len,

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 921434b8f387796b60a4fef5554f87d2fe9b90a4..c22963616d125579033f4385adb72dc539555efa 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.35.9"
-#define BDATE   "18 October 2004"
-#define LSMDATE "18Oct04"
+#define BDATE   "19 October 2004"
+#define LSMDATE "19Oct04"
 
 /* Debug flags */
 #undef  DEBUG