sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s4:ldb_register_samba_handlers - fix up and convert result codes to LDB/LDAP results

Browse Source
This commit is contained in:
Matthias Dieter Wallnöfer 2010-09-11 17:41:38 +02:00
parent ea3f21dff6
commit c0a863b6f3
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/dsdb/common/tests/dsdb_dn.c
View File

@ -44,7 +44,7 @@ static bool torture_dsdb_dn_attrs(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
ldb_register_samba_handlers(ldb), 0,
ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@ -127,7 +127,7 @@ static bool torture_dsdb_dn_valid(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
ldb_register_samba_handlers(ldb), 0,
ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@ -249,7 +249,7 @@ static bool torture_dsdb_dn_invalid(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
ldb_register_samba_handlers(ldb), 0,
ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);

2
source4/lib/ldb-samba/ldb_wrap.c
View File

@ -192,7 +192,7 @@ static int ldb_wrap_destructor(struct ldb_wrap *w)
* precedence over the 'binary attribute' declaration in the
* schema */
ret = ldb_register_samba_handlers(ldb);
if (ret == -1) {
if (ret != LDB_SUCCESS) {
talloc_free(ldb);
return NULL;
}

2
source4/lib/ldb-samba/ldif_handlers.c
View File

@ -1278,7 +1278,7 @@ int ldb_register_samba_handlers(struct ldb_context *ldb)
}
if (!s) {
return -1;
return LDB_ERR_OPERATIONS_ERROR;
}
ret = ldb_schema_attribute_add_with_syntax(ldb, samba_attributes[i].name, LDB_ATTR_FLAG_FIXED, s);

2
source4/lib/ldb/tools/cmdline.c
View File

@ -122,7 +122,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb,
#if (_SAMBA_BUILD_ >= 4)
r = ldb_register_samba_handlers(ldb);
if (r != 0) {
if (r != LDB_SUCCESS) {
goto failed;
}

2
source4/torture/drs/rpc/dssync.c
View File

@ -265,7 +265,7 @@ static bool test_LDAPBind(struct torture_context *tctx, struct DsSyncTest *ctx,
/* Despite us loading the schema from the AD server, we need
* the samba handlers to get the extended DN syntax stuff */
ret = ldb_register_samba_handlers(ldb);
if (ret == -1) {
if (ret != LDB_SUCCESS) {
talloc_free(ldb);
return NULL;
}

10
source4/torture/ldb/ldb.c
View File

@ -57,7 +57,7 @@ static bool torture_ldb_attrs(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
ldb_register_samba_handlers(ldb), 0,
ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@ -216,7 +216,7 @@ static bool torture_ldb_dn_attrs(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
ldb_register_samba_handlers(ldb), 0,
ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@ -334,7 +334,7 @@ static bool torture_ldb_dn_extended(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
ldb_register_samba_handlers(ldb), 0,
ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@ -595,7 +595,7 @@ static bool torture_ldb_dn(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
ldb_register_samba_handlers(ldb), 0,
ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
@ -707,7 +707,7 @@ static bool torture_ldb_dn_invalid_extended(struct torture_context *torture)
"Failed to init ldb");
torture_assert_int_equal(torture,
ldb_register_samba_handlers(ldb), 0,
ldb_register_samba_handlers(ldb), LDB_SUCCESS,
"Failed to register Samba handlers");
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);