From b0a95ad2f68cfc87822420c22216d83c0abf0690 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 24 Sep 2008 23:59:59 +0200
Subject: Revert LDB return code patches from Matthias.

---
 source4/lib/ldb/ldb_ldap/ldb_ldap.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source4/lib/ldb/ldb_ldap')

diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
index 5026f9c006..a4534c549a 100644
--- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
@@ -180,14 +180,14 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
 	count = ldap_count_values_len(bval);
 
 	if (count <= 0) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	el = talloc_realloc(msg, msg->elements, struct ldb_message_element, 
 			      msg->num_elements + 1);
 	if (!el) {
 		errno = ENOMEM;
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	msg->elements = el;
@@ -197,7 +197,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
 	el->name = talloc_strdup(msg->elements, attr);
 	if (!el->name) {
 		errno = ENOMEM;
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 	el->flags = 0;
 
@@ -205,7 +205,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
 	el->values = talloc_array(msg->elements, struct ldb_val, count);
 	if (!el->values) {
 		errno = ENOMEM;
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 
 	for (i=0;i<count;i++) {
@@ -214,7 +214,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
 		el->values[i].data = talloc_size(el->values, bval[i]->bv_len+1);
 		if (!el->values[i].data) {
 			errno = ENOMEM;
-			return LDB_ERR_OPERATIONS_ERROR;
+			return -1;
 		}
 		memcpy(el->values[i].data, bval[i]->bv_val, bval[i]->bv_len);
 		el->values[i].data[bval[i]->bv_len] = 0;
@@ -224,7 +224,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb,
 
 	msg->num_elements++;
 
-	return LDB_SUCCESS;
+	return 0;
 }
 
 /*
@@ -785,7 +785,7 @@ static int lldb_connect(struct ldb_context *ldb,
 	if (module == NULL) {
 		ldb_oom(ldb);
 		talloc_free(lldb);
-		return LDB_ERR_OPERATIONS_ERROR;
+		return -1;
 	}
 	talloc_set_name_const(module, "ldb_ldap backend");
 	module->ldb		= ldb;
@@ -819,11 +819,11 @@ static int lldb_connect(struct ldb_context *ldb,
 	}
 
 	*_module = module;
-	return LDB_SUCCESS;
+	return 0;
 
 failed:
 	talloc_free(module);
-	return LDB_ERR_OPERATIONS_ERROR;
+	return -1;
 }
 
 const struct ldb_backend_ops ldb_ldap_backend_ops = {
-- 
cgit