summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-05 03:06:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:59:07 -0500
commitf5778d5f9e2aadb026860a8441ab7475bfa490dd (patch)
treed1119b88d64f1b9e24badd9d974603fced9afb68 /source4/dsdb/samdb
parent90b49dc5208a083922c75595749d9abd4ef5b652 (diff)
downloadsamba-f5778d5f9e2aadb026860a8441ab7475bfa490dd.tar.gz
samba-f5778d5f9e2aadb026860a8441ab7475bfa490dd.tar.bz2
samba-f5778d5f9e2aadb026860a8441ab7475bfa490dd.zip
r23718: Make Samba4 work against the LDAP backend again.
When we set up the schema, we don't have a partitions container yet. The LDAP error differs from that given by LDB, so I think we still have some conformance work to do. Andrew Bartlett (This used to be commit 5ddbca73d4971a885c105c8d893e53598c5582b4)
Diffstat (limited to 'source4/dsdb/samdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/naming_fsmo.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/naming_fsmo.c b/source4/dsdb/samdb/ldb_modules/naming_fsmo.c
index ddd120caf2..d1c48f4125 100644
--- a/source4/dsdb/samdb/ldb_modules/naming_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/naming_fsmo.c
@@ -69,10 +69,16 @@ static int naming_fsmo_init(struct ldb_module *module)
LDB_SCOPE_BASE,
NULL, naming_attrs,
&naming_res);
+ if (ret == LDB_ERR_NO_SUCH_OBJECT) {
+ ldb_debug(module->ldb, LDB_DEBUG_WARNING,
+ "naming_fsmo_init: no partitions dn present: (skip loading of naming contexts details)\n");
+ talloc_free(mem_ctx);
+ return ldb_next_init(module);
+ }
if (ret != LDB_SUCCESS) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
- "naming_fsmo_init: failed to search the cross-ref container: %d:%s\n",
- ret, ldb_strerror(ret));
+ "naming_fsmo_init: failed to search the cross-ref container: %s: %s\n",
+ ldb_strerror(ret), ldb_errstring(module->ldb));
talloc_free(mem_ctx);
return ret;
}