s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATU...
authorGünther Deschner <gd@samba.org>
Tue, 10 Nov 2009 12:10:12 +0000 (13:10 +0100)
committerKarolin Seeger <kseeger@samba.org>
Wed, 13 Jan 2010 13:00:55 +0000 (14:00 +0100)
Guenther

Part of a fix for bug #6697.
And hopefully a fix for bug #6889.
(cherry picked from commit b6f1eced1f88b747c4cc8077ebf6bf4370100e09)

source/rpc_client/cli_pipe.c

index 6a5802e97f74320e3865fd51e6651af95c4c29be..88bd4be98ab02b2d01a9e7da5d987fd53fb06b50 100644 (file)
@@ -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;
 }
 
 /****************************************************************************