diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-02-23 08:42:41 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-02-23 10:23:32 +0100 |
| commit | f924b7749280b31ece19885de1c3ad1bd71942ac (patch) | |
| tree | 86e4e6a42c8d12c526228706d3d51d418e9dc03a | |
| parent | 4ef82accfe41eebabf26714d0a074d48d7134a26 (diff) | |
| download | samba-f924b7749280b31ece19885de1c3ad1bd71942ac.tar.gz samba-f924b7749280b31ece19885de1c3ad1bd71942ac.tar.bz2 samba-f924b7749280b31ece19885de1c3ad1bd71942ac.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
| -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 479602a9b4..ed06dde2ff 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1641,7 +1641,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; } @@ -1769,9 +1769,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; } } |