Revert LDB return code patches from Matthias.

5 files changed, 49 insertions, 49 deletions

diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c b/source4/lib/ldb/ldb_tdb/ldb_cache.c
index e502f1e642..2576e2c7bd 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_cache.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_cache.c
@@ -92,11 +92,11 @@ static int ltdb_attributes_flags(struct ldb_message_element *el, unsigned *v)
 			}
 		}
 		if (ltdb_valid_attr_flags[j].name == NULL) {
-			return LDB_ERR_OPERATIONS_ERROR;
+			return -1;
 		}
 	}
 	*v = value;
-	return LDB_SUCCESS;
+	return 0;
 }
 
 /*
@@ -118,7 +118,7 @@ static int ltdb_attributes_load(struct ldb_module *module)
 		goto failed;
 	}
 	if (r == LDB_ERR_NO_SUCH_OBJECT) {
-		return LDB_SUCCESS;
+		return 0;
 	}
 	/* mapping these flags onto ldap 'syntaxes' isn't strictly correct,
 	   but its close enough for now */
@@ -162,9 +162,9 @@ static int ltdb_attributes_load(struct ldb_module *module)
 		}
 	}
 
-	return LDB_SUCCESS;
+	return 0;
 failed:
-	return LDB_ERR_OPERATIONS_ERROR;
+	return -1;
 }
 
 
@@ -258,7 +258,7 @@ int ltdb_cache_load(struct ldb_module *module)
 	/* a very fast check to avoid extra database reads */
 	if (ltdb->cache != NULL && 
 	    tdb_get_seqnum(ltdb->tdb) == ltdb->tdb_seqnum) {
-		return LDB_SUCCESS;
+		return 0;
 	}
 
 	if (ltdb->cache == NULL) {
@@ -344,7 +344,7 @@ int ltdb_cache_load(struct ldb_module *module)
 		goto failed;
 	}
 
-	if (ltdb_attributes_load(module) != LDB_SUCCESS) {
+	if (ltdb_attributes_load(module) == -1) {
 		goto failed;
 	}
 
@@ -353,14 +353,14 @@ done:
 	talloc_free(baseinfo);
 	talloc_free(baseinfo_dn);
 	talloc_free(indexlist_dn);
-	return LDB_SUCCESS;
+	return 0;
 
 failed:
 	talloc_free(options);
 	talloc_free(baseinfo);
 	talloc_free(baseinfo_dn);
 	talloc_free(indexlist_dn);
-	return LDB_ERR_OPERATIONS_ERROR;
+	return -1;
 }
 
 
@@ -449,10 +449,10 @@ int ltdb_check_at_attributes_values(const struct ldb_val *value)
 
 	for (i = 0; ltdb_valid_attr_flags[i].name != NULL; i++) {
 		if ((strcmp(ltdb_valid_attr_flags[i].name, (char *)value->data) == 0)) {
-			return LDB_SUCCESS;
+			return 0;
 		}
 	}
 
-	return LDB_ERR_OPERATIONS_ERROR;
+	return -1;
 }
 
diff --git a/source4/lib/ldb/ldb_tdb/ldb_pack.c b/source4/lib/ldb/ldb_tdb/ldb_pack.c
index d96e7590e7..afb07dcbca 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_pack.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_pack.c
@@ -89,7 +89,7 @@ int ltdb_pack_data(struct ldb_module *module,
 	dn = ldb_dn_get_linearized(message->dn);
 	if (dn == NULL) {
 		errno = ENOMEM;
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	/* work out how big it needs to be */
@@ -114,7 +114,7 @@ int ltdb_pack_data(struct ldb_module *module,
 	data->dptr = talloc_array(ldb, uint8_t, size);
 	if (!data->dptr) {
 		errno = ENOMEM;
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 	data->dsize = size;
 
@@ -147,7 +147,7 @@ int ltdb_pack_data(struct ldb_module *module,
 		}
 	}
 
-	return LDB_SUCCESS;
+	return 0;
 }
 
 /*
@@ -207,7 +207,7 @@ int ltdb_unpack_data(struct ldb_module *module,
 
 	if (message->num_elements == 0) {
 		message->elements = NULL;
-		return LDB_SUCCESS;
+		return 0;
 	}
 	
 	if (message->num_elements > remaining / 6) {
@@ -281,9 +281,9 @@ int ltdb_unpack_data(struct ldb_module *module,
 			  "Error: %d bytes unread in ltdb_unpack_data\n", remaining);
 	}
 
-	return LDB_SUCCESS;
+	return 0;
 
 failed:
 	talloc_free(message->elements);
-	return LDB_ERR_OPERATIONS_ERROR;
+	return -1;
 }
diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c
index ce7a90e3d5..da899c361e 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_search.c
@@ -262,7 +262,7 @@ int ltdb_search_dn1(struct ldb_module *module, struct ldb_dn *dn, struct ldb_mes
 
 	ret = ltdb_unpack_data(module, &tdb_data, msg);
 	free(tdb_data.dptr);
-	if (ret != LDB_SUCCESS) {
+	if (ret == -1) {
 		return LDB_ERR_OPERATIONS_ERROR;		
 	}
 
@@ -285,7 +285,7 @@ static int ltdb_lock_read(struct ldb_module *module)
 	if (ltdb->in_transaction == 0) {
 		return tdb_lockall_read(ltdb->tdb);
 	}
-	return LDB_SUCCESS;
+	return 0;
 }
 
 /*
@@ -297,7 +297,7 @@ static int ltdb_unlock_read(struct ldb_module *module)
 	if (ltdb->in_transaction == 0) {
 		return tdb_unlockall_read(ltdb->tdb);
 	}
-	return LDB_SUCCESS;
+	return 0;
 }
 
 /*
@@ -317,14 +317,14 @@ int ltdb_add_attr_results(struct ldb_module *module,
 	/* pull the attributes that the user wants */
 	msg2 = ltdb_pull_attrs(module, mem_ctx, msg, attrs);
 	if (!msg2) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	/* add to the results list */
 	res2 = talloc_realloc(mem_ctx, *res, struct ldb_message *, (*count)+2);
 	if (!res2) {
 		talloc_free(msg2);
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	(*res) = res2;
@@ -333,7 +333,7 @@ int ltdb_add_attr_results(struct ldb_module *module,
 	(*res)[(*count)+1] = NULL;
 	(*count)++;
 
-	return LDB_SUCCESS;
+	return 0;
 }
 
 
@@ -356,7 +356,7 @@ int ltdb_filter_attrs(struct ldb_message *msg, const char * const *attrs)
 
 			if (ldb_attr_cmp(attrs[i], "distinguishedName") == 0) {
 				if (msg_add_distinguished_name(msg) != 0) {
-					return LDB_ERR_OPERATIONS_ERROR;
+					return -1;
 				}
 			}
 		}
@@ -366,9 +366,9 @@ int ltdb_filter_attrs(struct ldb_message *msg, const char * const *attrs)
 	
 	if (keep_all) {
 		if (msg_add_distinguished_name(msg) != 0) {
-			return LDB_ERR_OPERATIONS_ERROR;
+			return -1;
 		}
-		return LDB_SUCCESS;
+		return 0;
 	}
 
 	for (i = 0; i < msg->num_elements; i++) {
@@ -387,7 +387,7 @@ int ltdb_filter_attrs(struct ldb_message *msg, const char * const *attrs)
 		}
 	}
 
-	return LDB_SUCCESS;
+	return 0;
 }
 
 /*
@@ -402,14 +402,14 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
 
 	if (key.dsize < 4 || 
 	    strncmp((char *)key.dptr, "DN=", 3) != 0) {
-		return LDB_SUCCESS;
+		return 0;
 	}
 
 	ares = talloc_zero(ac, struct ldb_reply);
 	if (!ares) {
 		handle->status = LDB_ERR_OPERATIONS_ERROR;
 		handle->state = LDB_ASYNC_DONE;
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	ares->message = ldb_msg_new(ares);
@@ -417,14 +417,14 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
 		handle->status = LDB_ERR_OPERATIONS_ERROR;
 		handle->state = LDB_ASYNC_DONE;
 		talloc_free(ares);
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	/* unpack the record */
 	ret = ltdb_unpack_data(ac->module, &data, ares->message);
-	if (ret) {
+	if (ret == -1) {
 		talloc_free(ares);
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	if (!ares->message->dn) {
@@ -433,7 +433,7 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
 			handle->status = LDB_ERR_OPERATIONS_ERROR;
 			handle->state = LDB_ASYNC_DONE;
 			talloc_free(ares);
-			return LDB_ERR_OPERATIONS_ERROR;
+			return -1;
 		}
 	}
 
@@ -441,17 +441,17 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
 	if (!ldb_match_msg(ac->module->ldb, ares->message, ac->tree, 
 			       ac->base, ac->scope)) {
 		talloc_free(ares);
-		return LDB_SUCCESS;
+		return 0;
 	}
 
 	/* filter the attributes that the user wants */
 	ret = ltdb_filter_attrs(ares->message, ac->attrs);
 
-	if (ret != LDB_SUCCESS) {
+	if (ret == -1) {
 		handle->status = LDB_ERR_OPERATIONS_ERROR;
 		handle->state = LDB_ASYNC_DONE;
 		talloc_free(ares);
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	ares->type = LDB_REPLY_ENTRY;
@@ -460,10 +460,10 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
 
 	if (handle->status != LDB_SUCCESS) {
 		/* don't try to free ares here, the callback is in charge of that */
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}	
 
-	return LDB_SUCCESS;
+	return 0;
 }
 
 
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index b711efd1fa..01d570c89a 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -174,7 +174,7 @@ int ltdb_check_special_dn(struct ldb_module *module,
 
 	if (! ldb_dn_is_special(msg->dn) ||
 	    ! ldb_dn_check_special(msg->dn, LTDB_ATTRIBUTES)) {
-		return LDB_SUCCESS;
+		return 0;
 	}
 
 	/* we have @ATTRIBUTES, let's check attributes are fine */
@@ -188,7 +188,7 @@ int ltdb_check_special_dn(struct ldb_module *module,
 		}
 	}
 
-	return LDB_SUCCESS;
+	return 0;
 }
 
 
@@ -231,7 +231,7 @@ int ltdb_store(struct ldb_module *module, const struct ldb_message *msg, int flg
 	}
 
 	ret = ltdb_pack_data(module, msg, &tdb_data);
-	if (ret != LDB_SUCCESS) {
+	if (ret == -1) {
 		talloc_free(tdb_key.dptr);
 		return LDB_ERR_OTHER;
 	}
@@ -626,7 +626,7 @@ int ltdb_modify_internal(struct ldb_module *module,
 	}
 
 	ret = ltdb_unpack_data(module, &tdb_data, msg2);
-	if (ret != LDB_SUCCESS) {
+	if (ret == -1) {
 		ret = LDB_ERR_OTHER;
 		goto failed;
 	}
@@ -1069,7 +1069,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
 		if (strncmp(url, "tdb://", 6) != 0) {
 			ldb_debug(ldb, LDB_DEBUG_ERROR,
 				  "Invalid tdb URL '%s'", url);
-			return LDB_ERR_OPERATIONS_ERROR;
+			return -1;
 		}
 		path = url+6;
 	} else {
@@ -1097,7 +1097,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
 	ltdb = talloc_zero(ldb, struct ltdb_private);
 	if (!ltdb) {
 		ldb_oom(ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	/* note that we use quite a large default hash size */
@@ -1108,7 +1108,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
 		ldb_debug(ldb, LDB_DEBUG_ERROR,
 			  "Unable to open tdb '%s'\n", path);
 		talloc_free(ltdb);
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	ltdb->sequence_number = 0;
@@ -1117,7 +1117,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
 	if (!module) {
 		ldb_oom(ldb);
 		talloc_free(ltdb);
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 	talloc_set_name_const(*module, "ldb_tdb backend");
 	(*module)->ldb = ldb;
@@ -1128,10 +1128,10 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url,
 	if (ltdb_cache_load(*module) != 0) {
 		talloc_free(*module);
 		talloc_free(ltdb);
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
-	return LDB_SUCCESS;
+	return 0;
 }
 
 const struct ldb_backend_ops ldb_tdb_backend_ops = {
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
index 9d856355be..4fea43c8c8 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
@@ -53,7 +53,7 @@ static int ltdb_wrap_destructor(struct ltdb_wrap *w)
 	if (w == tdb_list) {
 		tdb_list = w->next;
 	}
-	return LDB_SUCCESS;
+	return 0;
 }				 
 
 static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);