diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-14 11:35:21 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-05 06:32:07 +1000 |
| commit | ff9b6682a014f47e3b367c3286407bfc39fd286c (patch) | |
| tree | 7086ed36ed1373875540559b4a355b583f430695 /source3/auth/server_info.c | |
| parent | 17d8f0ad30847bb940f645ee1817d782ddaaee74 (diff) | |
| download | samba-ff9b6682a014f47e3b367c3286407bfc39fd286c.tar.gz samba-ff9b6682a014f47e3b367c3286407bfc39fd286c.tar.bz2 samba-ff9b6682a014f47e3b367c3286407bfc39fd286c.zip | |
s3-auth Rename user_session_key -> session_key to match auth_session_info
Diffstat (limited to 'source3/auth/server_info.c')
| -rw-r--r-- | source3/auth/server_info.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c index 3190b756c4..440e45c8e5 100644 --- a/source3/auth/server_info.c +++ b/source3/auth/server_info.c @@ -80,11 +80,11 @@ NTSTATUS serverinfo_to_SamInfo2(struct auth_serversupplied_info *server_info, return NT_STATUS_NO_MEMORY; } - if (server_info->user_session_key.length) { + if (server_info->session_key.length) { memcpy(info3->base.key.key, - server_info->user_session_key.data, + server_info->session_key.data, MIN(sizeof(info3->base.key.key), - server_info->user_session_key.length)); + server_info->session_key.length)); if (pipe_session_key) { arcfour_crypt(info3->base.key.key, pipe_session_key, 16); @@ -123,11 +123,11 @@ NTSTATUS serverinfo_to_SamInfo3(const struct auth_serversupplied_info *server_in return NT_STATUS_NO_MEMORY; } - if (server_info->user_session_key.length) { + if (server_info->session_key.length) { memcpy(info3->base.key.key, - server_info->user_session_key.data, + server_info->session_key.data, MIN(sizeof(info3->base.key.key), - server_info->user_session_key.length)); + server_info->session_key.length)); if (pipe_session_key) { arcfour_crypt(info3->base.key.key, pipe_session_key, 16); @@ -181,11 +181,11 @@ NTSTATUS serverinfo_to_SamInfo6(struct auth_serversupplied_info *server_info, return NT_STATUS_NO_MEMORY; } - if (server_info->user_session_key.length) { + if (server_info->session_key.length) { memcpy(info3->base.key.key, - server_info->user_session_key.data, + server_info->session_key.data, MIN(sizeof(info3->base.key.key), - server_info->user_session_key.length)); + server_info->session_key.length)); if (pipe_session_key) { arcfour_crypt(info3->base.key.key, pipe_session_key, 16); |