[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  1b57fd1 s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().
      from  52d66d8 s3-winbind: Fix a segfault passing NULL to a fstring argument.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1b57fd180c2640598c13d2459a7c7a6f04708388
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 12 17:23:12 2013 +0200

    s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().
    
    Fallback to lsa named-pipe connection when tcp connection has failed twice (it
    could be a trusted domain connection where we cannot setup a secure channel).
    
    Guenther
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=9615
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=9899
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Tested-by: Christof Schmitt <christof.schmitt at us.ibm.com>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Aug 13 20:55:33 CEST 2013 on sn-devel-104

-----------------------------------------------------------------------

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 08c763c..1832b2b 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2651,11 +2651,16 @@ NTSTATUS cm_connect_lsat(struct winbindd_domain *domain,
 			invalidate_cm_connection(&domain->conn);
 			status = cm_connect_lsa_tcp(domain, mem_ctx, cli);
 		}
-		if (!NT_STATUS_IS_OK(status)) {
+		if (NT_STATUS_IS_OK(status)) {
 			return status;
 		}
 
-		return NT_STATUS_OK;
+		/*
+		 * we tried twice to connect via ncan_ip_tcp and schannel and
+		 * failed - maybe it is a trusted domain we can't connect to ?
+		 * do not try tcp next time - gd
+		 */
+		domain->can_do_ncacn_ip_tcp = false;
 	}
 
 	status = cm_connect_lsa(domain, mem_ctx, cli, lsa_policy);


-- 
Samba Shared Repository