diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-04-06 08:11:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:06 -0500 |
| commit | d17425ed52b086b7046708a207e849271cedc804 (patch) | |
| tree | 2b36b39f0332bed0281c30cfd75c47050a37704b /source3/rpc_server/srv_netlog_nt.c | |
| parent | 90b168bfc8bbbac3f96a82911260c8aa2d2e6a09 (diff) | |
| download | samba-d17425ed52b086b7046708a207e849271cedc804.tar.gz samba-d17425ed52b086b7046708a207e849271cedc804.tar.bz2 samba-d17425ed52b086b7046708a207e849271cedc804.zip | |
r69: Global rename of 'nt_session_key' -> 'user_session_key'. The session key could
be anything, and may not be based on anything 'NT'. This is also what microsoft
calls it.
(This used to be commit 724e8d3f33719543146280062435c69a835c491e)
Diffstat (limited to 'source3/rpc_server/srv_netlog_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index bf0e81f5c8..e3f687be13 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -691,7 +691,7 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * pstring my_name; fstring user_sid_string; fstring group_sid_string; - uchar nt_session_key[16]; + uchar user_session_key[16]; uchar lm_session_key[16]; uchar netlogon_sess_key[16]; @@ -727,10 +727,10 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * ZERO_STRUCT(netlogon_sess_key); memcpy(netlogon_sess_key, p->dc.sess_key, 8); - if (server_info->nt_session_key.length) { - memcpy(nt_session_key, server_info->nt_session_key.data, - MIN(sizeof(nt_session_key), server_info->nt_session_key.length)); - SamOEMhash(nt_session_key, netlogon_sess_key, 16); + 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); } if (server_info->lm_session_key.length) { memcpy(lm_session_key, server_info->lm_session_key.data, @@ -760,7 +760,7 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * num_gids, /* uint32 num_groups */ gids , /* DOM_GID *gids */ 0x20 , /* uint32 user_flgs (?) */ - server_info->nt_session_key.length ? nt_session_key : NULL, + server_info->user_session_key.length ? user_session_key : NULL, server_info->lm_session_key.length ? lm_session_key : NULL, my_name , /* char *logon_srv */ pdb_get_domain(sampw), @@ -768,7 +768,7 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * /* Should be users domain sid, not servers - for trusted domains */ NULL); /* char *other_sids */ - ZERO_STRUCT(nt_session_key); + ZERO_STRUCT(user_session_key); ZERO_STRUCT(lm_session_key); } free_server_info(&server_info); |