Fix open of SQLite3 db where user does not have write permission

     so that DIR does not crash. Fixes bug #761.

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

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 52bc7d2797bbd81605bdf7dfb697ab29ab66a482..2d6ba3734ad818b8353ff78fc61ef911abebf009 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,9 +1,27 @@
 
-          Release Notes for Bacula 2.0.1
+          Release Notes for Bacula 2.0.2
 
   Bacula code: Total files = 438 Total lines = 154,329 (*.h *.c *.in)
 
-This is a bug fix release to version 2.0.0:
+This is a bug fix release to version 2.0.1:
+
+25Jan07
+kes  Change 'Device not configured to autolabel' from INFO
+     to WARNING.
+kes  Fix jobq.c to restart failed jobs when Reschedule Times = 0
+     which should restart an indefinite # of times.
+kes  Fix configure --help to print --with-mysql[=DIR]. Same for
+     other DIR specifications.
+23Jan07
+rn   Fix msvc build problems. Fix bacula.dll exports for msvc build.
+     Fix path quoting in SQLite scripts.
+     Fix problems with SHGetFolderPath.
+19Jan07
+kes  Create patches/2.0.1-restart.patch. Fixes bug #755.
+18Jan07
+kes  Fix Job restart on error bug that promotes an Inc to a Full
+     backup.  This should fix bug #755.
+kes  Add qt-console and first cut of code.
 
 Version 2.0.1
 12Jan07

diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c
index 9fd557174fc9c0894cfe9480eab08d5668414e3b..d5aac93a5ad3a9072eb7e6f8269a1b2e28cc9abb 100644 (file)
--- a/bacula/src/cats/sqlite.c
+++ b/bacula/src/cats/sqlite.c
@@ -161,6 +161,8 @@ db_open_database(JCR *jcr, B_DB *mdb)
    int stat = sqlite3_open(db_name, &mdb->db);
    if (stat != SQLITE_OK) {
       mdb->sqlite_errmsg = (char *)sqlite3_errmsg(mdb->db); 
+      sqlite3_close(mdb->db);
+      mdb->db = NULL;
    } else {
       mdb->sqlite_errmsg = NULL;
    }

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 0415af1dcd2a8f65f3240a0d0d7a2d706437fc08..e1c3c5cdf745285b338e6f17030cde7dd61a2a35 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.0.1"
-#define BDATE   "12 January 2007"
-#define LSMDATE "12Jan07"
+#define VERSION "2.0.2"
+#define BDATE   "26 January 2007"
+#define LSMDATE "26Jan07"
 
 #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.0 b/bacula/technotes-2.0
index de99fd93980a7db2f5758e7e4bdfc6f178d8ed51..d57742ddb1493bb9e4c99b4031929b1f1a80bec4 100644 (file)
--- a/bacula/technotes-2.0
+++ b/bacula/technotes-2.0
@@ -1,6 +1,9 @@
               Technical notes on version 2.0
 
 General:
+26Jan07
+kes  Fix open of SQLite3 db where user does not have write permission
+     so that DIR does not crash. Fixes bug #761.
 25Jan07
 kes  Change 'Device not configured to autolabel' from INFO
      to WARNING.