diff options
| author | Jeremy Allison <jra@samba.org> | 2012-07-13 16:25:23 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-11-01 09:10:35 +0100 |
| commit | bf27038ead0be058cf7f3fca19ddc67ed808c8a0 (patch) | |
| tree | a55ac656bfb0d685c47b45b4abaf115cd06c2bf9 | |
| parent | 3243e66f5a1da68287f3e8bccf07b35c73457ef6 (diff) | |
| download | samba-bf27038ead0be058cf7f3fca19ddc67ed808c8a0.tar.gz | |
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
(cherry picked from commit 726ecf6a915ff534af4076e9d0cdebf8b5435d61)
(cherry picked from commit d4faae3dbdfdd600bbf9bddb2589b8a6dc8434b6)
(cherry picked from commit 265ff5579b2671db250928b631b35e4df3b9a7f6)
| -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 a63c3f553ea..7f55c0138f8 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1623,12 +1623,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); |