[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  93d9641 s4:dsdb_find_nc_root - fix it up to let the provisioning work correctly
      from  32e7d76 s4:auth/ntlm/auth_sam.c - fix call to "get_server_info_principal"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 93d96414be1e7fbf895a05025c0a3422dc55c88e
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sat Jan 15 18:12:09 2011 +0100

    s4:dsdb_find_nc_root - fix it up to let the provisioning work correctly
    
    Use the temporary list unless we have at least the three main
    "namingContexts" from the rootDSE available (Default, Configuration, Schema -
    these are mandatory on all AD deployments!).
    
    This bug has been discovered by Nadya in relation with her SD work.
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Sat Jan 15 19:01:11 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/common/util.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index b2d4be0..148a77d 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -3284,10 +3284,10 @@ int dsdb_find_nc_root(struct ldb_context *samdb, TALLOC_CTX *mem_ctx, struct ldb
 	}
 
 	el = ldb_msg_find_element(root_res->msgs[0], "namingContexts");
-	if (!el) {
+	if ((el == NULL) || (el->num_values < 3)) {
 		struct ldb_message *tmp_msg;
 
-		DEBUG(5,("Finding namingContexts element in root_res failed. Using a temporary list."));
+		DEBUG(5,("dsdb_find_nc_root: Finding a valid 'namingContexts' element in the RootDSE failed. Using a temporary list."));
 
 		/* This generates a temporary list of NCs in order to let the
 		 * provisioning work. */


-- 
Samba Shared Repository