The branch, v3-4-test has been updated via 1ea768b... s3:winbindd: never mark external domains as internal! from 5444ada... s3:winbind: Fix bug 5626
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log ----------------------------------------------------------------- commit 1ea768baa9bb38533d4bd273d6c4e7b1f5fd12bd Author: Stefan Metzmacher <me...@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 (cherry picked from commit f924b7749280b31ece19885de1c3ad1bd71942ac) ----------------------------------------------------------------------- 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 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; } } -- Samba Shared Repository