From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 23 Feb 2010 07:42:41 +0000 (+0100)
Subject: s3:winbindd: never mark external domains as internal!
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=adaadefe263d8cd192b67a63d1f1c13ba9bf748c;p=metze%2Fsamba%2Fwip.git

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
(cherry picked from commit f924b7749280b31ece19885de1c3ad1bd71942ac)
(cherry picked from commit 1ea768baa9bb38533d4bd273d6c4e7b1f5fd12bd)
---

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 4e27cc3a0154..6fbb0b91f912 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1617,7 +1617,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;
 	}
@@ -1745,9 +1745,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;
 		}		
 	}