From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 25 Mar 2010 14:15:57 +0000 (+0100)
Subject: s3:winbindd_cm: use rpccli_is_connected() helper function
X-Git-Url: http://git.samba.org/samba.git/?p=mimir%2Fsamba.git;a=commitdiff_plain;h=d980c06a994d032a833adc8d56d2f2c037f8fdaf

s3:winbindd_cm: use rpccli_is_connected() helper function

metze
---

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index d9b431a5011..24e555607ba 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2018,7 +2018,7 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
 
 	conn = &domain->conn;
 
-	if (conn->samr_pipe != NULL) {
+	if (rpccli_is_connected(conn->samr_pipe)) {
 		goto done;
 	}
 
@@ -2203,7 +2203,7 @@ NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain,
 	if (conn->lsa_pipe_tcp &&
 	    conn->lsa_pipe_tcp->transport->transport == NCACN_IP_TCP &&
 	    conn->lsa_pipe_tcp->auth->auth_level == DCERPC_AUTH_LEVEL_PRIVACY &&
-	    rpc_pipe_tcp_connection_ok(conn->lsa_pipe_tcp)) {
+	    rpccli_is_connected(conn->lsa_pipe_tcp)) {
 		goto done;
 	}
 
@@ -2245,7 +2245,7 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
 
 	conn = &domain->conn;
 
-	if (conn->lsa_pipe != NULL) {
+	if (rpccli_is_connected(conn->lsa_pipe)) {
 		goto done;
 	}
 
@@ -2376,7 +2376,7 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
 
 	conn = &domain->conn;
 
-	if (conn->netlogon_pipe != NULL) {
+	if (rpccli_is_connected(conn->netlogon_pipe)) {
 		*cli = conn->netlogon_pipe;
 		return NT_STATUS_OK;
 	}