diff options
| author | Jeremy Allison <jra@samba.org> | 2009-11-12 13:59:25 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-11-12 13:59:25 -0800 |
| commit | 03637130316099d4f3db4ce757af2f34ce46d881 (patch) | |
| tree | 6c99133cf0c3af7e9b39632ec8c5ff0364bd226d | |
| parent | 496d147dc4d50650ef1e88877aa28719458089b8 (diff) | |
| download | samba-03637130316099d4f3db4ce757af2f34ce46d881.tar.gz samba-03637130316099d4f3db4ce757af2f34ce46d881.tar.bz2 samba-03637130316099d4f3db4ce757af2f34ce46d881.zip | |
Remove erroneous 'presult = NULL' changes. Now presult only gets set
if NTSTATUS == OK.
Jeremy.
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 11 |
1 files changed, 2 insertions, 9 deletions
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)) { |