[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  03042b8 Bug 15852. There are valid paths where conn->lsa_pipe_tcp->transport is NULL. Protect against this.
      from  e9b4978 tevent: version 0.9.32

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


- Log -----------------------------------------------------------------
commit 03042b85c8140842633b36f3124e504b97b852a1
Author: Richard Sharpe <richard.sharpe at primarydata.com>
Date:   Tue Jun 20 12:40:39 2017 -0700

    Bug 15852. There are valid paths where conn->lsa_pipe_tcp->transport is NULL. Protect against this.
    
    Based on a suggestion from Metze.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12852
    
    Signed-off-by: Richard Sharpe <realrichardsharpe at gmail.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jun 22 23:16:46 CEST 2017 on sn-devel-144

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

Summary of changes:
 source3/winbindd/winbindd_cm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 9b5054c..b24a5f2 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2926,10 +2926,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;
 	}
 


-- 
Samba Shared Repository