Prune SQL fix; finish Linux rescue; doc

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

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 4ab7734af8f481b70322b4b56e9fdbd1024af72a..33c8e64e23a2a876ba87c42cc8afad934a12eafd 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -17,7 +17,8 @@ dummy:
 
 subdirs = src scripts doc src/lib src/findlib src/cats \
          @READLINE_SRC@ src/console src/dird src/filed \
-         src/stored @GNOME_DIR@ src/tools
+         src/stored @GNOME_DIR@ src/tools \
+         rescue rescue/linux
 
 FDsubdirs = src/lib src/findlib src/filed
 

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index ae6099b808a2358018e07b216b5a1ac257cff55d..e95bc5365a8faf3d85a8e3e485b530339bda4d7f 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1258,6 +1258,9 @@ AC_SUBST_FILE(MCOMMON)
 
 AC_OUTPUT([autoconf/Make.common \
           Makefile \
+          rescue/Makefile \
+          rescue/linux/Makefile \
+          rescue/freebsd/Makefile \
           scripts/startmysql \
           scripts/stopmysql \
           scripts/btraceback \

diff --git a/bacula/configure b/bacula/configure
index 591214ca8094930ea15394bbcf166965169b993d..d07bb6f5d968c112e947fcde0cb4e77db7d5ebca 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -9411,6 +9411,9 @@ ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "autoconf/Make.common \
           Makefile \
+          rescue/Makefile \
+          rescue/linux/Makefile \
+          rescue/freebsd/Makefile \
           scripts/startmysql \
           scripts/stopmysql \
           scripts/btraceback \
@@ -9664,6 +9667,9 @@ cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"autoconf/Make.common \
           Makefile \
+          rescue/Makefile \
+          rescue/linux/Makefile \
+          rescue/freebsd/Makefile \
           scripts/startmysql \
           scripts/stopmysql \
           scripts/btraceback \

diff --git a/bacula/kernstodo b/bacula/kernstodo
index c59909902d5368448a46f12d42d70b9e2e54c61b..c31fcbd8f6637eecfa6c4f89bee4d8ec677e474b 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -12,6 +12,7 @@ Testing to do: (painful)
 - blocksize recognition code.
 
 For 1.28 release:
+- Look at ua_prune.c in detail. Why did JobType work at all??????
 - Implement FileOptions (see end of this document)
 - Make hash table for linked files in findlib/find_one.c:161
 - Make bcopy read through bad tape records.

diff --git a/bacula/src/Makefile.in b/bacula/src/Makefile.in
index cc8f974fa3f34773692e4a28aeabfec3c88eb39a..fc778fca25a5cbb31d3dd723e77517342435ae9d 100644 (file)
--- a/bacula/src/Makefile.in
+++ b/bacula/src/Makefile.in
@@ -14,18 +14,10 @@ topdir = ..
 # this dir relative to top dir
 thisdir = src
 
-DEBUG=-DDEBUG_STRICT @DEBUG@
 
 first_rule: all
 dummy:
 
-#
-# these are the objects that are changed by the .configure process
-EXTRAOBJS = @OBJLIST@
-
-# it's ``be kind to gmake week''
-#EXTPROS = $(SRCS:S,.c,.extpro,)
-EXTPROS = 
 
 .SUFFIXES:     .c .o
 .PHONY:

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index 5f0f1438bcfc9c0c6ef0f5b775659897a5a49da7..129c27ae7a8bb9a29a3ba26c3a622be33eff14d5 100644 (file)
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -47,6 +47,12 @@ console: $(CONSOBJS) ../lib/libbac.a ../cats/libsql.a
        $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
              $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
 
+static-console: $(CONSOBJS) ../lib/libbac.a ../cats/libsql.a
+       $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+             $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
+       strip $@
+
+
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
        cd $(topdir) \
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 479c24543ee6693764ff1cefa57f5ea696d81d69..1eec1c924fa09976b146c053ba59d41d2cad9118 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -68,6 +68,12 @@ bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
        $(CXX) $(LDFLAGS) $(DIR_LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
              -lsql -lbac -lfind -lm $(LIBS) $(DLIB) $(DB_LIBS)
 
+static-bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
+       $(CXX) $(LDFLAGS) $(DIR_LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
+             -lsql -lbac -lfind -lm $(LIBS) $(DLIB) $(DB_LIBS)
+       strip $@
+
+
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
        cd $(topdir) \
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

diff --git a/bacula/src/dird/sql_cmds.c b/bacula/src/dird/sql_cmds.c
index 8b439148d3f347032adba202c76ba23525d906c5..c8999c36efa0ebda4d676b9e2cb62852db154599 100644 (file)
--- a/bacula/src/dird/sql_cmds.c
+++ b/bacula/src/dird/sql_cmds.c
@@ -69,7 +69,7 @@ char *create_deltabs[] = {
 char *insert_delcand = 
    "INSERT INTO DelCandidates "
    "SELECT JobId, PurgedFiles, FileSetId FROM Job "
-   "WHERE JobType='%c' "
+   "WHERE Type='%c' "
    "AND JobTDate<%s " 
    "AND ClientId=%u";
 
@@ -82,7 +82,7 @@ char *select_backup_del =
    "FROM Job,DelCandidates "
    "WHERE Job.JobTDate>%s "
    "AND Job.ClientId=%u "
-   "AND Job.JobType='B' "
+   "AND Job.Type='B' "
    "AND Job.Level='F' "
    "AND Job.JobStatus='T' "
    "AND Job.FileSetId=DelCandidates.FileSetId";
@@ -96,7 +96,7 @@ char *select_verify_del =
    "FROM Job,DelCandidates "
    "WHERE Job.JobTDate>%s "
    "AND Job.ClientId=%u "
-   "AND Job.JobType='V' "
+   "AND Job.Type='V' "
    "AND Job.Level='V' "
    "AND Job.JobStatus='T' "
    "AND Job.FileSetId=DelCandidates.FileSetId";
@@ -110,7 +110,7 @@ char *select_restore_del =
    "FROM Job,DelCandidates "
    "WHERE Job.JobTDate>%s "
    "AND Job.ClientId=%u "   
-   "AND Job.JobType='R'";
+   "AND Job.Type='R'";
 
 
 

diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c
index 3189a6ed7bb3ee898a154bfdfcb17f22e0318fa6..a4e27daef03fc4e9ba32df13ebed7e4492c64eba 100644 (file)
--- a/bacula/src/dird/ua_prune.c
+++ b/bacula/src/dird/ua_prune.c
@@ -410,9 +410,7 @@ int prune_jobs(UAContext *ua, CLIENT *client, int JobType)
    strcpy(query, cnt_DelCand);
    Dmsg1(100, "select sql=%s\n", query);
    if (!db_sql_query(ua->db, query, count_handler, (void *)&cnt)) {
-      if (ua->verbose) {
-         bsendmsg(ua, "%s", db_strerror(ua->db));
-      }
+      bsendmsg(ua, "%s", db_strerror(ua->db));
       Dmsg0(050, "Count failed\n");
       goto bail_out;
    }
@@ -444,7 +442,9 @@ int prune_jobs(UAContext *ua, CLIENT *client, int JobType)
       Mmsg(&query, select_verify_del, ed1, cr.ClientId);
       break;
    }
-   db_sql_query(ua->db, query, job_delete_handler, (void *)&del);
+   if (!db_sql_query(ua->db, query, job_delete_handler, (void *)&del)) {
+      bsendmsg(ua, "%s", db_strerror(ua->db));
+   }
 
    /* 
     * OK, now we have the list of JobId's to be pruned, first check
@@ -455,16 +455,22 @@ int prune_jobs(UAContext *ua, CLIENT *client, int JobType)
       Dmsg1(050, "Delete JobId=%d\n", del.JobId[i]);
       if (!del.PurgedFiles[i]) {
         Mmsg(&query, del_File, del.JobId[i]);
-        db_sql_query(ua->db, query, NULL, (void *)NULL);
+        if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
+            bsendmsg(ua, "%s", db_strerror(ua->db));
+        }
          Dmsg1(050, "Del sql=%s\n", query);
       }
 
       Mmsg(&query, del_Job, del.JobId[i]);
-      db_sql_query(ua->db, query, NULL, (void *)NULL);
+      if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
+         bsendmsg(ua, "%s", db_strerror(ua->db));
+      }
       Dmsg1(050, "Del sql=%s\n", query);
 
       Mmsg(&query, del_JobMedia, del.JobId[i]);
-      db_sql_query(ua->db, query, NULL, (void *)NULL);
+      if (!db_sql_query(ua->db, query, NULL, (void *)NULL)) {
+         bsendmsg(ua, "%s", db_strerror(ua->db));
+      }
       Dmsg1(050, "Del sql=%s\n", query);
    }
    bsendmsg(ua, _("Pruned %d %s for client %s from catalog.\n"), del.num_ids,

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index b285425e54dca3daa2cbd1555f10be52a86d519e..6b64ef74dff5e2f036a8daa13b9e1ffcc3c53875 100755 (executable)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -68,6 +68,12 @@ bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
        $(CXX) $(LDFLAGS) $(FD_LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
          $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB)
 
+static-bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
+       $(CXX) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+          $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(DLIB)
+       strip $@
+
+
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
        cd $(topdir) \
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index 9414fa838e2950502ef08c23e251d9f0c13ca985..21710b9c9fac46cf48bf59ccf072fd270cfa65bf 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -81,6 +81,10 @@ all: Makefile bacula-sd bls bextract bscan btape bcopy
 bacula-sd: $(SVROBJS) ../lib/libbac.a
        $(CXX) $(LDFLAGS) $(SD_LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
 
+static-bacula-sd: $(SVROBJS) ../lib/libbac.a
+       $(CXX) $(LDFLAGS) $(SD_LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(LIBS) $(DLIB)
+       strip $@
+
 btape: $(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a
        $(CXX) $(TTOOL_LDFLSGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) -lsql $(LIBS) $(DLIB) -lbac -lm
 

diff --git a/bacula/src/version.h b/bacula/src/version.h
index ba27ddc105dae3e33cb04a7cdcc00f3ee3c93ff5..4b154e43a6b43fa1e67f731754e9b8a36f343613 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #define VERSION "1.28"
 #define VSTRING "1"
-#define DATE    "19 December 2002"
-#define LSMDATE "19Dec02"
+#define DATE    "20 December 2002"
+#define LSMDATE "20Dec02"
 
 /* Debug flags */
 #define DEBUG 1