svn commit: samba r23718 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-07-05 03:06:59 +0000 (Thu, 05 Jul 2007)
New Revision: 23718

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23718

Log:
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

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/naming_fsmo.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/naming_fsmo.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/naming_fsmo.c	2007-07-05 02:52:58 UTC (rev 23717)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/naming_fsmo.c	2007-07-05 03:06:59 UTC (rev 23718)
@@ -69,10 +69,16 @@
 			 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;
 	}