diff options
| author | Jeremy Allison <jra@samba.org> | 2012-07-13 16:25:23 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-07-14 03:17:57 +0200 |
| commit | 726ecf6a915ff534af4076e9d0cdebf8b5435d61 (patch) | |
| tree | 7c4b2263427875cf4ee65b885c6f5f1a7dd10edd /source3 | |
| parent | 27e20d5d60ea8aa526bcb7c2dfc18dd2de0bb97b (diff) | |
| download | samba-726ecf6a915ff534af4076e9d0cdebf8b5435d61.tar.gz samba-726ecf6a915ff534af4076e9d0cdebf8b5435d61.tar.bz2 samba-726ecf6a915ff534af4076e9d0cdebf8b5435d61.zip | |
Fix bug #9016 - Connection to outbound trusted domain goes offline.
By the time we've gotten to init_dc_connection_network() we shouldn't
be second guessing the caller by calling winbindd_can_contact_domain().
If for some reason we do need to restrict the contact list here we
can add a condition to only contact the primary domain or domains
listed in the tdc cache, but I don't think that's neccessary.
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Jul 14 03:17:57 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index f52e723451..f1e4204115 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1740,12 +1740,6 @@ static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain) return NT_STATUS_OK; } - if (!winbindd_can_contact_domain(domain)) { - invalidate_cm_connection(&domain->conn); - domain->initialized = True; - return NT_STATUS_OK; - } - if (connection_ok(domain)) { if (!domain->initialized) { set_dc_type_and_flags(domain); |