Fix seg fault in FD status

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index ce4d2bf8faaf5e69763c6a87bad450319b0b317b..ebfe6c04064b966445c78c908050bc3bfde938bd 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-26 Release 1.23a
+- Fix segmentation fault is FD status.
+- Turn off TRANACTIONs for SQLite.                        
+
 2002-07-23 Release 1.23
   From kes22Jul02
 - Updated Bacula to handle some minor differences in MySQL 4.0.2

diff --git a/bacula/src/cats/bdb_get.c b/bacula/src/cats/bdb_get.c
index 0001233adb0b23866ff33d8a214d3ef2ec6d56b0..27347a3b47d7c5cf0a14af3b469ed74abac7f89b 100644 (file)
--- a/bacula/src/cats/bdb_get.c
+++ b/bacula/src/cats/bdb_get.c
@@ -272,6 +272,10 @@ int db_get_media_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
    /* Linear search through Pool records
     */
    len = sizeof(omr);
+   if (mdb->control.MediaId == 0) {
+      db_unlock(mdb);
+      return 0;
+   }
    *num_ids = mdb->control.MediaId;
    id = (uint32_t *)malloc(*num_ids * sizeof(uint32_t));
    while (fread(&omr, len, 1, mdb->mediafd) > 0) {

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index b250d63fb83edee692c955c14b31fc3ee994be1c..73b163ff958008b2b64ea167c9dfd6723637c3dc 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -109,8 +109,8 @@ ClientId=%d, JobTDate=%s WHERE JobId=%d",
    db_unlock(mdb);
 #ifdef HAVE_SQLITE
    /******FIXME***** do this machine independently */
-   my_sqlite_query(mdb, "BEGIN");     /* begin transaction */
-   mdb->transaction = 1;
+// my_sqlite_query(mdb, "BEGIN");     /* begin transaction */
+// mdb->transaction = 1;
 #endif
    mdb->changes = 0;
    return stat;

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index a245511e66e2945ced4efc7b927f66c31238baa8..33c7cbcb9c87040997554d67da77e1701f18c361 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -72,9 +72,10 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
       if (njcr->JobId == 0) {
          len = Mmsg(&msg, _("Director connected at: %s\n"), dt);
       } else {
-         len = Mmsg(&msg, _("JobId %d Job %s is running.\n    %s %s started: %s\n"), 
-            job_type_to_str(njcr->JobType), job_level_to_str(njcr->JobLevel),
-            njcr->JobId, njcr->Job, dt);
+         len = Mmsg(&msg, _("JobId %d Job %s is running.\n    %s Job started: %s\n"), 
+            njcr->JobId, njcr->Job, job_type_to_str(njcr->JobType), 
+            dt);
+//          job_level_to_str(njcr->JobLevel), dt);
       }
       sendit(msg, len, arg);
       if (njcr->JobId == 0) {

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 0ffb565361b90ab73c4079cd300b0dc1ae667293..acb2b814615e1e39545d0b2304c39317b894ab90 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
-#define VERSION "1.23"
+#define VERSION "1.23a"
 #define VSTRING "1"
-#define DATE    "22 July 2002"
-#define LSMDATE "22Jul02"
+#define DATE    "26 July 2002"
+#define LSMDATE "26Jul02"
 
 /* Debug flags */
 #define DEBUG 1