Attempt to fix bug 5616

We were calculating the session key but did not return it to the caller...
(cherry picked from commit 8ab79b1d009d53e414b90e4a0ab8fc7a4889b6df)

diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 851a4a8da825285befa304cfe822feef2cb13fa6..38ff41c92762f7dc92233e4a95d26d7f41b575a6 100644 (file)
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -424,8 +424,6 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
        union netr_Validation validation;
        struct netr_ChallengeResponse lm;
        struct netr_ChallengeResponse nt;
-       struct netr_UserSessionKey user_session_key;
-       struct netr_LMSessionKey lmsesskey;
 
        *info3 = NULL;
 
@@ -500,15 +498,14 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
                return result;
        }
 
-       user_session_key = validation.sam3->base.key;
-       lmsesskey = validation.sam3->base.LMSessKey;
-
-       if (memcmp(zeros, user_session_key.key, 16) != 0) {
-               SamOEMhash(user_session_key.key, cli->dc->sess_key, 16);
+       if (memcmp(zeros, validation.sam3->base.key.key, 16) != 0) {
+               SamOEMhash(validation.sam3->base.key.key,
+                          cli->dc->sess_key, 16);
        }
 
-       if (memcmp(zeros, lmsesskey.key, 8) != 0) {
-               SamOEMhash(lmsesskey.key, cli->dc->sess_key, 8);
+       if (memcmp(zeros, validation.sam3->base.LMSessKey.key, 8) != 0) {
+               SamOEMhash(validation.sam3->base.LMSessKey.key,
+                          cli->dc->sess_key, 8);
        }
 
        if (memcmp(zeros, ret_creds.cred.data, sizeof(ret_creds.cred.data)) != 0) {