diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-04-06 14:42:04 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-05-06 14:08:37 +0200 |
| commit | 72d1c1e0d3cf5b0e2486c1eb0309b7e61f3277ea (patch) | |
| tree | 9ce0a21c58ea7de86cbec55a9685be63d371f445 | |
| parent | 7884f2879d94dffb279a8b0bcae508afcc7e66dc (diff) | |
| download | samba-72d1c1e0d3cf5b0e2486c1eb0309b7e61f3277ea.tar.gz | |
s3:winbindd_cm: use rpccli_is_connected() helper function
metze
(cherry picked from commit d980c06a994d032a833adc8d56d2f2c037f8fdaf)
(cherry picked from commit aa7d54ed04585a183a88363406ed7f3244b24d85)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit ff9277fb804e7d99a7e80d67c70b962b6199a4e3)
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index cb8027ebd62..d3d2e16c82a 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -2006,7 +2006,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; } @@ -2190,7 +2190,8 @@ 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 == PIPE_AUTH_LEVEL_PRIVACY) { + conn->lsa_pipe_tcp->auth->auth_level == PIPE_AUTH_LEVEL_PRIVACY && + rpccli_is_connected(conn->lsa_pipe_tcp)) { goto done; } @@ -2232,7 +2233,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; } @@ -2363,7 +2364,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; } |