The branch, master has been updated via 726ecf6 Fix bug #9016 - Connection to outbound trusted domain goes offline. from 27e20d5 s3: Make us survive smb2.lock.rw-shared with aio enabled
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 726ecf6a915ff534af4076e9d0cdebf8b5435d61 Author: Jeremy Allison <j...@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 <j...@samba.org> Autobuild-Date(master): Sat Jul 14 03:17:57 CEST 2012 on sn-devel-104 ----------------------------------------------------------------------- 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 f52e723..f1e4204 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); -- Samba Shared Repository