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)

3 files changed, 47 insertions, 36 deletions

diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c
index 3644d046e0..d6e7d66f68 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_search.c
@@ -272,44 +272,63 @@ int ltdb_search_dn1(struct ldb_module *module, const char *dn, struct ldb_messag
 /*
   search the database for a single simple dn
 */
-int ltdb_search_dn(struct ldb_module *module, const char *dn,
-		   const char * const attrs[], struct ldb_message ***res)
+static int ltdb_search_dn(struct ldb_module *module, const char *dn,
+			  const char * const attrs[], struct ldb_message ***res)
 {
 	struct ldb_context *ldb = module->ldb;
+	struct ltdb_private *ltdb = module->private_data;
 	int ret;
 	struct ldb_message *msg, *msg2;
 
+	*res = NULL;
+
+	if (ltdb_lock_read(module) != 0) {
+		return -1;
+	}
+
+	ltdb->last_err_string = NULL;
+
+	if (ltdb_cache_load(module) != 0) {
+		ltdb_unlock_read(module);
+		return -1;
+	}
+
 	*res = talloc_array(ldb, struct ldb_message *, 2);
 	if (! *res) {
-		return -1;		
+		goto failed;
 	}
 
 	msg = talloc(*res, struct ldb_message);
 	if (msg == NULL) {
-		talloc_free(*res);
-		*res = NULL;
-		return -1;
+		goto failed;
 	}
 
 	ret = ltdb_search_dn1(module, dn, msg);
 	if (ret != 1) {
 		talloc_free(*res);
 		*res = NULL;
-		return ret;
+		ltdb_unlock_read(module);
+		return 0;
 	}
 
 	msg2 = ltdb_pull_attrs(module, msg, attrs);
 
 	talloc_free(msg);
-
 	if (!msg2) {
-		return -1;		
+		goto failed;
 	}
 
 	(*res)[0] = talloc_steal(*res, msg2);
 	(*res)[1] = NULL;
 
+	ltdb_unlock_read(module);
+
 	return 1;
+
+failed:
+	talloc_free(*res);
+	ltdb_unlock_read(module);
+	return -1;
 }
 
 
@@ -508,7 +527,6 @@ int ltdb_search(struct ldb_module *module, const char *base,
 	/* check if we are looking for a simple dn */
 	if (scope == LDB_SCOPE_BASE && (expression == NULL || expression[0] == '\0')) {
 		ret = ltdb_search_dn(module, base, attrs, res);
-		ltdb_unlock_read(module);
 		return ret;
 	}
 
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index 6516787a5a..596ede8a4e 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -49,9 +49,9 @@
 */
 static int ltdb_case_fold_attr_required(void * user_data, char *attr)
 {
-    struct ldb_module *module = user_data;
+	struct ldb_module *module = talloc_get_type(user_data, struct ldb_module);
 
-    return ltdb_attribute_flags(module, attr) & LTDB_FLAG_CASE_INSENSITIVE;
+	return ltdb_attribute_flags(module, attr) & LTDB_FLAG_CASE_INSENSITIVE;
 }
 
 /*
@@ -746,6 +746,11 @@ static int ltdb_rename(struct ldb_module *module, const char *olddn, const char
 		return -1;
 	}
 
+	if (ltdb_cache_load(module) != 0) {
+		ltdb_unlock(module, LDBLOCK);
+		return -1;
+	}
+
 	msg = talloc(module, struct ldb_message);
 	if (msg == NULL) {
 		goto failed;
@@ -829,28 +834,19 @@ static int ltdb_destructor(void *p)
 /*
   connect to the database
 */
-struct ldb_context *ltdb_connect(const char *url, 
-				 unsigned int flags, 
-				 const char *options[])
+int ltdb_connect(struct ldb_context *ldb, const char *url, 
+		 unsigned int flags, const char *options[])
 {
 	const char *path;
 	int tdb_flags, open_flags;
 	struct ltdb_private *ltdb;
 	TDB_CONTEXT *tdb;
-	struct ldb_context *ldb;
-
-	ldb = talloc_zero(NULL, struct ldb_context);
-	if (!ldb) {
-		errno = ENOMEM;
-		return NULL;
-	}
 
 	/* parse the url */
 	if (strchr(url, ':')) {
 		if (strncmp(url, "tdb://", 6) != 0) {
-			errno = EINVAL;
-			talloc_free(ldb);
-			return NULL;
+			ldb_debug(ldb, LDB_DEBUG_ERROR, "Invalid tdb URL '%s'", url);
+			return -1;
 		}
 		path = url+6;
 	} else {
@@ -868,16 +864,15 @@ struct ldb_context *ltdb_connect(const char *url,
 	/* note that we use quite a large default hash size */
 	tdb = tdb_open(path, 10000, tdb_flags, open_flags, 0666);
 	if (!tdb) {
-		talloc_free(ldb);
-		return NULL;
+		ldb_debug(ldb, LDB_DEBUG_ERROR, "Unable to open tdb '%s'", path);
+		return -1;
 	}
 
 	ltdb = talloc_zero(ldb, struct ltdb_private);
 	if (!ltdb) {
 		tdb_close(tdb);
-		talloc_free(ldb);
-		errno = ENOMEM;
-		return NULL;
+		ldb_oom(ldb);
+		return -1;
 	}
 
 	ltdb->tdb = tdb;
@@ -887,14 +882,14 @@ struct ldb_context *ltdb_connect(const char *url,
 
 	ldb->modules = talloc(ldb, struct ldb_module);
 	if (!ldb->modules) {
-		talloc_free(ldb);
-		errno = ENOMEM;
-		return NULL;
+		ldb_oom(ldb);
+		talloc_free(ltdb);
+		return -1;
 	}
 	ldb->modules->ldb = ldb;
 	ldb->modules->prev = ldb->modules->next = NULL;
 	ldb->modules->private_data = ltdb;
 	ldb->modules->ops = &ltdb_ops;
 
-	return ldb;
+	return 0;
 }
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index b77e02fba5..6377092a21 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -91,8 +91,6 @@ int ltdb_has_wildcard(struct ldb_module *module, const char *attr_name,
 		      const struct ldb_val *val);
 void ltdb_search_dn1_free(struct ldb_module *module, struct ldb_message *msg);
 int ltdb_search_dn1(struct ldb_module *module, const char *dn, struct ldb_message *msg);
-int ltdb_search_dn(struct ldb_module *module, const char *dn,
-		   const char * const attrs[], struct ldb_message ***res);
 int ltdb_add_attr_results(struct ldb_module *module, struct ldb_message *msg,
 			  const char * const attrs[], 
 			  int *count,