r7709: - convert ldb to use popt, so that it can interact with the samba

  cmdline credentials code (which will be done soon)

- added a ldb_init() call, and changed ldb_connect() to take a ldb
  context. This allows for much better error handling in
  ldb_connect(), and also made the popt conversion easier

- fixed up all the existing backends with the new syntax

- improved error handling in *_connect()

- fixed a crash bug in the new case_fold_required() code

- ensured that ltdb_rename() and all ltdb_search() paths get the read lock

- added a ldb_oom() macro to make it easier to report out of memory
  situations in ldb code
(This used to be commit f648fdf187669d6d87d01dd4e786b03cd420f220)

1 files changed, 10 insertions, 13 deletions

diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index 51830db94c..3d36043044 100644
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -216,21 +216,16 @@ static const struct ldb_module_ops lsqlite3_ops = {
 /*
  * connect to the database
  */
-struct ldb_context *
-lsqlite3_connect(const char *url, 
-                 unsigned int flags, 
-                 const char *options[])
+int lsqlite3_connect(struct ldb_context *ldb,
+		     const char *url, 
+		     unsigned int flags, 
+		     const char *options[])
 {
 	int                         i;
         int                         ret;
 	struct ldb_context *        ldb = NULL;
 	struct lsqlite3_private *   lsqlite3 = NULL;
         
-	ldb = talloc(NULL, struct ldb_context);
-	if (!ldb) {
-		goto failed;
-	}
-        
 	lsqlite3 = talloc(ldb, struct lsqlite3_private);
 	if (!lsqlite3) {
 		goto failed;
@@ -279,14 +274,14 @@ lsqlite3_connect(const char *url,
 		}
 	}
         
-	return ldb;
+	return 0;
         
 failed:
         if (lsqlite3->sqlite != NULL) {
                 (void) sqlite3_close(lsqlite3->sqlite);
         }
-	talloc_free(ldb);
-	return NULL;
+	talloc_free(lsqlite3);
+	return -1;
 }
 
 
@@ -1204,7 +1199,9 @@ destructor(void *p)
 {
 	struct lsqlite3_private *   lsqlite3 = p;
         
-        (void) sqlite3_close(lsqlite3->sqlite);
+	if (lsqlite3->sqlite) {
+		sqlite3_close(lsqlite3->sqlite);
+	}
 	return 0;
 }