The branch, master has been updated
via 80e0661... s4:operational LDB module - Fix usage of LDB constants
from fed6ac0... s4:ntvfs/posix/pvfs_streams - Fix "discard const" warning
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 80e066112c033ce3684a4adede3f40565f68277f
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Thu Dec 3 12:50:18 2009 +0100
s4:operational LDB module - Fix usage of LDB constants
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/operational.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c
b/source4/dsdb/samdb/ldb_modules/operational.c
index e48f91b..031544d 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -88,7 +88,7 @@ static int construct_canonical_name(struct ldb_module *module,
char *canonicalName;
canonicalName = ldb_dn_canonical_string(msg, msg->dn);
if (canonicalName == NULL) {
- return -1;
+ return LDB_ERR_OPERATIONS_ERROR;
}
return ldb_msg_add_steal_string(msg, "canonicalName", canonicalName);
}
@@ -255,13 +255,13 @@ static int operational_search_post_process(struct
ldb_module *module,
/* construct the new attribute, using either a supplied
constructor or a simple copy */
- if (search_sub[i].constructor) {
- if (search_sub[i].constructor(module, msg) !=
0) {
+ if (search_sub[i].constructor != NULL) {
+ if (search_sub[i].constructor(module, msg) !=
LDB_SUCCESS) {
goto failed;
}
} else if (ldb_msg_copy_attr(msg,
search_sub[i].replace,
- search_sub[i].attr) != 0) {
+ search_sub[i].attr) !=
LDB_SUCCESS) {
goto failed;
}
--
Samba Shared Repository
