From 771d4fab26c8580cbc186caee067884a314ecbc7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 18 Nov 2005 23:48:51 +0000 Subject: r11796: Two more uses of !composite_is_ok (This used to be commit 7256157d01ff47d33706dadd45851cf2fbbce3a6) --- source4/libcli/smb2/connect.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index cdfc162aae..7ed3f97bf3 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -47,10 +47,7 @@ static void continue_tcon(struct smb2_request *req) struct smb2_connect_state); c->status = smb2_tree_connect_recv(req, &state->tcon); - if (!NT_STATUS_IS_OK(c->status)) { - composite_error(c, c->status); - return; - } + if (!composite_is_ok(c)) return; state->tree->tid = state->tcon.out.tid; @@ -69,10 +66,7 @@ static void continue_session(struct composite_context *creq) struct smb2_request *req; c->status = smb2_session_setup_spnego_recv(creq); - if (!NT_STATUS_IS_OK(c->status)) { - composite_error(c, c->status); - return; - } + if (!composite_is_ok(c)) return; state->tree = smb2_tree_init(state->session, state, True); if (composite_nomem(state->tree, c)) return; @@ -102,10 +96,7 @@ static void continue_negprot(struct smb2_request *req) struct composite_context *creq; c->status = smb2_negprot_recv(req, c, &state->negprot); - if (!NT_STATUS_IS_OK(c->status)) { - composite_error(c, c->status); - return; - } + if (!composite_is_ok(c)) return; state->session = smb2_session_init(transport, state, True); if (composite_nomem(state->session, c)) return; @@ -129,10 +120,7 @@ static void continue_socket(struct composite_context *creq) struct smb2_request *req; c->status = smbcli_sock_connect_recv(creq, state, &sock); - if (!NT_STATUS_IS_OK(c->status)) { - composite_error(c, c->status); - return; - } + if (!composite_is_ok(c)) return; transport = smb2_transport_init(sock, state); if (composite_nomem(transport, c)) return; @@ -160,10 +148,7 @@ static void continue_resolve(struct composite_context *creq) const char *addr; c->status = resolve_name_recv(creq, state, &addr); - if (!NT_STATUS_IS_OK(c->status)) { - composite_error(c, c->status); - return; - } + if (!composite_is_ok(c)) return; creq = smbcli_sock_connect_send(state, addr, 445, state->host, c->event_ctx); -- cgit