From 03637130316099d4f3db4ce757af2f34ce46d881 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 12 Nov 2009 13:59:25 -0800 Subject: Remove erroneous 'presult = NULL' changes. Now presult only gets set if NTSTATUS == OK. Jeremy. --- source3/rpc_client/cli_pipe.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'source3/rpc_client') diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 0e658a2da8..084bbef44c 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -3469,18 +3469,13 @@ NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx, const char *host, NTSTATUS status; uint16_t port = 0; - *presult = NULL; - status = rpc_pipe_get_tcp_port(host, abstract_syntax, &port); if (!NT_STATUS_IS_OK(status)) { - goto done; + return status; } - status = rpc_pipe_open_tcp_port(mem_ctx, host, port, + return rpc_pipe_open_tcp_port(mem_ctx, host, port, abstract_syntax, presult); - -done: - return status; } /******************************************************************** @@ -4123,8 +4118,6 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli, struct rpc_pipe_client *result = NULL; NTSTATUS status; - *presult = NULL; - status = get_schannel_session_key(cli, domain, &neg_flags, &netlogon_pipe); if (!NT_STATUS_IS_OK(status)) { -- cgit