From f5778d5f9e2aadb026860a8441ab7475bfa490dd Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 5 Jul 2007 03:06:59 +0000 Subject: 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) --- source4/dsdb/samdb/ldb_modules/naming_fsmo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source4') 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; } -- cgit