From 45943210a16dff42d3041dfba2160506da242db7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 23 Feb 2010 08:42:41 +0100 Subject: [PATCH] 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) --- source3/winbindd/winbindd_cm.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 32afe40..481d985 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1627,7 +1627,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; } @@ -1755,9 +1755,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; } } -- 1.6.3.3