Fix bug #9016 - Connection to outbound trusted domain goes offline.
authorJeremy Allison <jra@samba.org>
Fri, 13 Jul 2012 23:25:23 +0000 (16:25 -0700)
committerKarolin Seeger <kseeger@samba.org>
Fri, 28 Sep 2012 07:07:58 +0000 (09:07 +0200)
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)

source3/winbindd/winbindd_cm.c

index 7d7244ad1fe03d3898778ce466a6513845087962..d129e1f61c7a75c44ec0b4e5585e82b99b490073 100644 (file)
@@ -1769,12 +1769,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);