Attachment 13297 Details for Bug 12852 – Patch for master

[patch] Patch for master

0001-Bug-15852.-There-are-valid-paths-where-conn-lsa_pipt.patch.txt (text/plain), 1.19 KB, created by Richard Sharpe on 2017-06-20 19:48:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Sharpe

Created: 2017-06-20 19:48:06 UTC

Size: 1.19 KB

patch

obsolete

>From c27928b57a11a77f6d3d2306a9cc0055fec03b51 Mon Sep 17 00:00:00 2001
>From: Richard Sharpe <richard.sharpe@primarydata.com>
>Date: Tue, 20 Jun 2017 12:40:39 -0700
>Subject: [PATCH] Bug 15852. There are valid paths where
> conn->lsa_pipt_tcp->transport is NULL. Protect against this.
>
>Based on a suggestion from Metze.
>
>Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
>---
> source3/winbindd/winbindd_cm.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
>index 7566a30..d874f3e 100644
>--- a/source3/winbindd/winbindd_cm.c
>+++ b/source3/winbindd/winbindd_cm.c
>@@ -2927,10 +2927,12 @@ static NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain,
> 
> 	conn = &domain->conn;
> 
>-	if (conn->lsa_pipe_tcp &&
>+	/*
>+	 * rpccli_is_connected handles more error cases
>+	 */
>+	if (rpccli_is_connected(conn->lsa_pipe_tcp) &&
> 	    conn->lsa_pipe_tcp->transport->transport == NCACN_IP_TCP &&
>-	    conn->lsa_pipe_tcp->auth->auth_level >= DCERPC_AUTH_LEVEL_INTEGRITY &&
>-	    rpccli_is_connected(conn->lsa_pipe_tcp)) {
>+	    conn->lsa_pipe_tcp->auth->auth_level >= DCERPC_AUTH_LEVEL_INTEGRITY) {
> 		goto done;
> 	}
> 
>-- 
>2.3.6
>

Actions: View

Attachments on bug 12852: 13297 | 13304