diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-02-23 08:42:41 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-05-06 14:26:32 +0200 |
| commit | 9e54c38b785c37ed7d6376382bd75076cb431a15 (patch) | |
| tree | 4d02847f8f1f5f4041b68d900666a0d0466deb6e | |
| parent | 0839da5e76a13012efbcca0ef5fab7717cb3fc2d (diff) | |
| download | samba-9e54c38b785c37ed7d6376382bd75076cb431a15.tar.gz | |
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)
| -rw-r--r-- | 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 d8bde4690f6..5878a8abe38 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1614,7 +1614,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; } @@ -1742,9 +1742,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; } } |