rpc_client: Bug 5616 - fix session keys also in rpccli_netr_LogonSamLogonEx wrapper.

Guenther
(This used to be commit fef58091408cce0d7870c86f28f78cf9400cf2b6)

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index e96d724ee9cddacff6789808e6756fe4a0ffc24e..df87ed13d132ddd97bbd3f2da255e5516d3cdc06 100644 (file)
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -453,8 +453,6 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(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;
        uint32_t flags = 0;
 
        *info3 = NULL;
@@ -526,15 +524,14 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(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);
        }
 
        *info3 = validation.sam3;