diff options
| author | Jeremy Allison <jra@samba.org> | 2006-02-09 07:03:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:09:59 -0500 |
| commit | ad8b47a2ba4e81420bc2272e8438a727cc2223ee (patch) | |
| tree | b6f23560649f3b54aa3458d3c8667f145805ec5b /source3/rpc_server | |
| parent | cf7c47aac990f67e1829a7e4b9d3550b7e93739b (diff) | |
| download | samba-ad8b47a2ba4e81420bc2272e8438a727cc2223ee.tar.gz samba-ad8b47a2ba4e81420bc2272e8438a727cc2223ee.tar.bz2 samba-ad8b47a2ba4e81420bc2272e8438a727cc2223ee.zip | |
r13407: Change the credentials code to be more like the Samba4 structure,
makes fixes much easier to port. Fix the size of dc->sess_key to
be 16 bytes, not 8 bytes - only store 8 bytes in the inter-smbd
store in secrets.tdb though. Should fix some uses of the dc->sess_key
where we where assuming we could read 16 bytes.
Jeremy.
(This used to be commit 5b3c2e63c73fee8949108abe19ac7a448a033a7f)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index d6ec31a985..784f733617 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -817,7 +817,6 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * fstring group_sid_string; uchar user_session_key[16]; uchar lm_session_key[16]; - uchar netlogon_sess_key[16]; sampw = server_info->sam_account; @@ -859,23 +858,20 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * return status; } - ZERO_STRUCT(netlogon_sess_key); - memcpy(netlogon_sess_key, p->dc->sess_key, 8); if (server_info->user_session_key.length) { memcpy(user_session_key, server_info->user_session_key.data, MIN(sizeof(user_session_key), server_info->user_session_key.length)); - SamOEMhash(user_session_key, netlogon_sess_key, 16); + SamOEMhash(user_session_key, p->dc->sess_key, 16); } if (server_info->lm_session_key.length) { memcpy(lm_session_key, server_info->lm_session_key.data, MIN(sizeof(lm_session_key), server_info->lm_session_key.length)); - SamOEMhash(lm_session_key, netlogon_sess_key, 16); + SamOEMhash(lm_session_key, p->dc->sess_key, 16); } - ZERO_STRUCT(netlogon_sess_key); init_net_user_info3(p->mem_ctx, usr_info, user_rid, |