summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-11-10 13:10:12 +0100
committerKarolin Seeger <kseeger@samba.org>2010-01-13 14:00:55 +0100
commit00e8942b330972bcf2e611571b3ad0cbdd6c8191 (patch)
treee6aae837483559ab13ce2b9aa2fe62776986d815 /source
parentd38e82fc78d6008a4c0ee7407296494d3fc5098b (diff)
downloadsamba-00e8942b330972bcf2e611571b3ad0cbdd6c8191.tar.gz
samba-00e8942b330972bcf2e611571b3ad0cbdd6c8191.tar.xz
samba-00e8942b330972bcf2e611571b3ad0cbdd6c8191.zip
s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.
Guenther Part of a fix for bug #6697. And hopefully a fix for bug #6889. (cherry picked from commit b6f1eced1f88b747c4cc8077ebf6bf4370100e09)
Diffstat (limited to 'source')
-rw-r--r--source/rpc_client/cli_pipe.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index 6a5802e97f7..88bd4be98ab 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -3372,6 +3372,8 @@ 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)) {
@@ -3392,7 +3394,7 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli,
*presult = result;
}
- return NT_STATUS_OK;
+ return status;
}
/****************************************************************************