diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-02-23 08:42:41 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-02-24 16:25:10 +0100 |
| commit | e9fb545b5888c4627dae56d53ec61c778182c21f (patch) | |
| tree | f0d00347c3c130a0258b6e9c52e831f2fadd03d2 | |
| parent | 9816f15ed245a0d678500da5958c4190c3b47316 (diff) | |
| download | samba-e9fb545b5888c4627dae56d53ec61c778182c21f.tar.gz samba-e9fb545b5888c4627dae56d53ec61c778182c21f.tar.xz samba-e9fb545b5888c4627dae56d53ec61c778182c21f.zip | |
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 40f359476d7ec3aec252f79bd2127dd08b305a9f)
| -rw-r--r-- | source/winbindd/winbindd_cm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c index bd502a5ece0..0ca71670418 100644 --- a/source/winbindd/winbindd_cm.c +++ b/source/winbindd/winbindd_cm.c @@ -1618,7 +1618,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; } @@ -1746,9 +1746,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; } } |