[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Thu Aug 18 04:49:01 MDT 2011


The branch, master has been updated
       via  dcb5720 s3/ldap: don't continue if we couldn't get the domain info on startup
      from  5f33017 s4-test: use dbcheck on more of our selftest databases

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


- Log -----------------------------------------------------------------
commit dcb5720ad01fabac300da478368c140e2b6313d2
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Aug 15 14:46:12 2011 +0200

    s3/ldap: don't continue if we couldn't get the domain info on startup
    
    while some things work without the domain info, some important things don't,
    which is highly irritating. As even calls like EnumTrustDom fail and
    thus clients' domain logins fail we are sufficiently broken to refuse to go on.
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Thu Aug 18 12:48:37 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/passdb/pdb_ldap.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 74dccec..8b6f07c 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -6576,13 +6576,10 @@ NTSTATUS pdb_init_ldapsam(struct pdb_methods **pdb_method, const char *location)
 					       ldap_state->domain_name, True);
 
 	if ( !NT_STATUS_IS_OK(nt_status) ) {
-		DEBUG(2, ("pdb_init_ldapsam: WARNING: Could not get domain "
-			  "info, nor add one to the domain\n"));
-		DEBUGADD(2, ("pdb_init_ldapsam: Continuing on regardless, "
-			     "will be unable to allocate new users/groups, "
-			     "and will risk BDCs having inconsistent SIDs\n"));
-		sid_copy(&ldap_state->domain_sid, get_global_sam_sid());
-		return NT_STATUS_OK;
+		DEBUG(0, ("pdb_init_ldapsam: WARNING: Could not get domain "
+			  "info, nor add one to the domain. "
+			  "We cannot work reliably without it.\n"));
+		return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
 	}
 
 	/* Given that the above might fail, everything below this must be


-- 
Samba Shared Repository


More information about the samba-cvs mailing list