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/trunk@4045 91ce42f0-d328-0410-95d8-f526ca767f89

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 ee96c8d5f644d46560219f0fd55ed548573b5f28..60553d41a3da772d50fc54e4382a8478c79878fd 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.1.1"
-#define BDATE   "18 January 2007"
-#define LSMDATE "18Jan07"
+#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.1 b/bacula/technotes-2.1
index effa64a2656115e14fce298d16b903640a3e650b..62be12ed38157344b0b9409f3e580a1826d8c941 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,9 @@
               Technical notes on version 2.1
 
 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  Add back missing @ in Win32 Makefile.
 kes  Change 'Device not configured to autolabel' from INFO