[SCM] Samba Shared Repository - branch v3-6-test updated

Karolin Seeger kseeger at samba.org
Fri Sep 28 01:08:33 MDT 2012

The branch, v3-6-test has been updated
       via  d4faae3 Fix bug #9016 - Connection to outbound trusted domain goes offline.
      from  f2d6c00 s3-spoolss: Fix builtin forms order to match Windows again.


- Log -----------------------------------------------------------------
commit d4faae3dbdfdd600bbf9bddb2589b8a6dc8434b6
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jul 13 16:25:23 2012 -0700

    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 at samba.org>
    Autobuild-Date(master): Sat Jul 14 03:17:57 CEST 2012 on sn-devel-104
    (cherry picked from commit 726ecf6a915ff534af4076e9d0cdebf8b5435d61)


Summary of changes:
 source3/winbindd/winbindd_cm.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 7d7244a..d129e1f 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -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) {

Samba Shared Repository

More information about the samba-cvs mailing list