Attachment 9132 Details for Bug 9899 – git-am fix for 4.1.0, 4.0.next, 3.6.next

[patch] git-am fix for 4.1.0, 4.0.next, 3.6.next

0001-s3-winbindd-fix-fallback-to-ncacn_np-in-cm_connect_l.patch (text/plain), 1.79 KB, created by Jeremy Allison on 2013-08-14 00:21:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2013-08-14 00:21:17 UTC

Size: 1.79 KB

patch

obsolete

>From 1b57fd180c2640598c13d2459a7c7a6f04708388 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Mon, 12 Aug 2013 17:23:12 +0200
>Subject: [PATCH] s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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@samba.org>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>Tested-by: Christof Schmitt <christof.schmitt@us.ibm.com>
>
>Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
>Autobuild-Date(master): Tue Aug 13 20:55:33 CEST 2013 on sn-devel-104
>---
> source3/winbindd/winbindd_cm.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>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);
>-- 
>1.8.3
>

Actions: View

Attachments on bug 9899: 8906 | 9132