summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-24 23:59:59 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-25 00:01:05 +0200
commitb0a95ad2f68cfc87822420c22216d83c0abf0690 (patch)
tree8ac863eafe2c9bc1109404b975ad0f5be8b22154 /source4/dsdb/samdb
parent31e10643c998e64c0ec432553ac9193d978e43f4 (diff)
downloadsamba-b0a95ad2f68cfc87822420c22216d83c0abf0690.tar.gz
samba-b0a95ad2f68cfc87822420c22216d83c0abf0690.tar.bz2
samba-b0a95ad2f68cfc87822420c22216d83c0abf0690.zip
Revert LDB return code patches from Matthias.
Diffstat (limited to 'source4/dsdb/samdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/kludge_acl.c4
-rw-r--r--source4/dsdb/samdb/ldb_modules/proxy.c12
-rw-r--r--source4/dsdb/samdb/ldb_modules/repl_meta_data.c14
-rw-r--r--source4/dsdb/samdb/ldb_modules/schema_fsmo.c2
4 files changed, 16 insertions, 16 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 11e2b7ade9..6836f95873 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -142,7 +142,7 @@ static int kludge_acl_allowedAttributes(struct ldb_context *ldb, struct ldb_mess
ldb_msg_add_string(msg, attrName, attr_list[i]);
}
talloc_free(mem_ctx);
- return LDB_SUCCESS;
+ return 0;
}
/* read all objectClasses */
@@ -201,7 +201,7 @@ static int kludge_acl_childClasses(struct ldb_context *ldb, struct ldb_message *
}
}
- return LDB_SUCCESS;
+ return 0;
}
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 7aa78e98a9..d0a315e45a 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -66,7 +66,7 @@ static int load_proxy_info(struct ldb_module *module)
/* see if we have already loaded it */
if (proxy->upstream != NULL) {
- return LDB_SUCCESS;
+ return 0;
}
dn = ldb_dn_new(proxy, module->ldb, "@PROXYINFO");
@@ -145,7 +145,7 @@ static int load_proxy_info(struct ldb_module *module)
talloc_free(res);
- return LDB_SUCCESS;
+ return 0;
failed:
talloc_free(res);
@@ -153,7 +153,7 @@ failed:
talloc_free(proxy->newdn);
talloc_free(proxy->upstream);
proxy->upstream = NULL;
- return LDB_ERR_OPERATIONS_ERROR;
+ return -1;
}
@@ -259,7 +259,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
}
if (load_proxy_info(module) != 0) {
- return LDB_ERR_OPERATIONS_ERROR;
+ return -1;
}
/* see if the dn is within olddn */
@@ -269,7 +269,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
newreq = talloc(module, struct ldb_request);
if (newreq == NULL) {
- return LDB_ERR_OPERATIONS_ERROR;
+ return -1;
}
newreq->op.search.tree = proxy_convert_tree(module, req->op.search.tree);
@@ -298,7 +298,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
if (ret != LDB_SUCCESS) {
ldb_set_errstring(module->ldb, ldb_errstring(proxy->upstream));
talloc_free(newreq);
- return LDB_ERR_OPERATIONS_ERROR;
+ return -1;
}
for (i = 0; i < newreq->op.search.res->count; i++) {
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 34e235aec7..dd5faf837a 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -124,16 +124,16 @@ static int add_time_element(struct ldb_message *msg, const char *attr, time_t t)
char *s;
if (ldb_msg_find_element(msg, attr) != NULL) {
- return LDB_SUCCESS;
+ return 0;
}
s = ldb_timestring(msg, t);
if (s == NULL) {
- return LDB_ERR_OPERATIONS_ERROR;
+ return -1;
}
if (ldb_msg_add_string(msg, attr, s) != 0) {
- return LDB_ERR_OPERATIONS_ERROR;
+ return -1;
}
el = ldb_msg_find_element(msg, attr);
@@ -141,7 +141,7 @@ static int add_time_element(struct ldb_message *msg, const char *attr, time_t t)
is ignored */
el->flags = LDB_FLAG_MOD_REPLACE;
- return LDB_SUCCESS;
+ return 0;
}
/*
@@ -152,11 +152,11 @@ static int add_uint64_element(struct ldb_message *msg, const char *attr, uint64_
struct ldb_message_element *el;
if (ldb_msg_find_element(msg, attr) != NULL) {
- return LDB_SUCCESS;
+ return 0;
}
if (ldb_msg_add_fmt(msg, attr, "%llu", (unsigned long long)v) != 0) {
- return LDB_ERR_OPERATIONS_ERROR;
+ return -1;
}
el = ldb_msg_find_element(msg, attr);
@@ -164,7 +164,7 @@ static int add_uint64_element(struct ldb_message *msg, const char *attr, uint64_
is ignored */
el->flags = LDB_FLAG_MOD_REPLACE;
- return LDB_SUCCESS;
+ return 0;
}
static int replmd_replPropertyMetaData1_attid_sort(const struct replPropertyMetaData1 *m1,
diff --git a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
index 7c6a6dd26f..968b19c038 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
@@ -307,7 +307,7 @@ static int generate_dITContentRules(struct ldb_context *ldb, struct ldb_message
}
}
}
- return LDB_SUCCESS;
+ return 0;
}