[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  f924b77... s3:winbindd: never mark external domains as internal!
      from  4ef82ac... s4:netlogon RPC - fix the indentation

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


- Log -----------------------------------------------------------------
commit f924b7749280b31ece19885de1c3ad1bd71942ac
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 23 08:42:41 2010 +0100

    s3:winbindd: never mark external domains as internal!
    
    This way we can endup with silently using builtin_passdb_methods
    for an ad domain without an inbound trust.
    
    This fixes bug #7170.
    
    metze

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

Summary of changes:
 source3/winbindd/winbindd_cm.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 479602a..ed06dde 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1641,7 +1641,7 @@ static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain)
 	NTSTATUS result;
 
 	/* Internal connections never use the network. */
-	if (domain->internal) {
+	if (domain->internal || !winbindd_can_contact_domain(domain)) {
 		domain->initialized = True;
 		return NT_STATUS_OK;
 	}
@@ -1769,9 +1769,6 @@ static bool set_dc_type_and_flags_trustinfo( struct winbindd_domain *domain )
 
 			domain->initialized = True;
 
-			if ( !winbindd_can_contact_domain( domain) )
-				domain->internal = True;
-
 			break;
 		}		
 	}


-- 
Samba Shared Repository