diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-05-11 18:58:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:39 -0500 |
| commit | d4d4d668280f10cc4f1a6af86adc1d9210520df2 (patch) | |
| tree | bf86d3729ac65c5d738c251be4a4ab9c43c1cc9a /source4/auth/ntlmssp/ntlmssp_server.c | |
| parent | 3bdd579f553fa83f89868e84d0679702faf6cd15 (diff) | |
| download | samba-d4d4d668280f10cc4f1a6af86adc1d9210520df2.tar.gz samba-d4d4d668280f10cc4f1a6af86adc1d9210520df2.tar.bz2 samba-d4d4d668280f10cc4f1a6af86adc1d9210520df2.zip | |
r6736: Revert metze's -r 6734, as metze and I made the same changes at the
same time, but with different names. This just helps me avoid
conflicts when I merge up my other changes.
Andrew Bartlett
(This used to be commit 27e6a853a5160cb1ad595bea25e891eeae439662)
Diffstat (limited to 'source4/auth/ntlmssp/ntlmssp_server.c')
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index c3a2d4179a..c54d30abdc 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -350,11 +350,11 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms gensec_ntlmssp_state->doing_ntlm2 = True; - memcpy(gensec_ntlmssp_state->v.ntlm2.session_nonce, gensec_ntlmssp_state->internal_chal.data, 8); - memcpy(&gensec_ntlmssp_state->v.ntlm2.session_nonce[8], gensec_ntlmssp_state->lm_resp.data, 8); + memcpy(gensec_ntlmssp_state->ntlm2.session_nonce, gensec_ntlmssp_state->internal_chal.data, 8); + memcpy(&gensec_ntlmssp_state->ntlm2.session_nonce[8], gensec_ntlmssp_state->lm_resp.data, 8); MD5Init(&md5_session_nonce_ctx); - MD5Update(&md5_session_nonce_ctx, gensec_ntlmssp_state->v.ntlm2.session_nonce, 16); + MD5Update(&md5_session_nonce_ctx, gensec_ntlmssp_state->ntlm2.session_nonce, 16); MD5Final(session_nonce_hash, &md5_session_nonce_ctx); gensec_ntlmssp_state->chal = data_blob_talloc(gensec_ntlmssp_state, @@ -404,8 +404,8 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_ntlmssp_state *gensec_ntlm if (gensec_ntlmssp_state->doing_ntlm2) { if (user_session_key && user_session_key->data && user_session_key->length == 16) { session_key = data_blob_talloc(gensec_ntlmssp_state, NULL, 16); - hmac_md5(user_session_key->data, gensec_ntlmssp_state->v.ntlm2.session_nonce, - sizeof(gensec_ntlmssp_state->v.ntlm2.session_nonce), session_key.data); + hmac_md5(user_session_key->data, gensec_ntlmssp_state->ntlm2.session_nonce, + sizeof(gensec_ntlmssp_state->ntlm2.session_nonce), session_key.data); DEBUG(10,("ntlmssp_server_auth: Created NTLM2 session key.\n")); dump_data_pw("NTLM2 session key:\n", session_key.data, session_key.length); |