summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-14 11:35:21 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-04-05 06:32:07 +1000
commitff9b6682a014f47e3b367c3286407bfc39fd286c (patch)
tree7086ed36ed1373875540559b4a355b583f430695 /source3/smbd
parent17d8f0ad30847bb940f645ee1817d782ddaaee74 (diff)
downloadsamba-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/smbd')
-rw-r--r--source3/smbd/password.c2
-rw-r--r--source3/smbd/smb2_sesssetup.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 4b38de7eca..720b1bf4c2 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -331,7 +331,7 @@ int register_existing_vuid(struct smbd_server_connection *sconn,
/* Try and turn on server signing on the first non-guest
* sessionsetup. */
srv_set_signing(sconn,
- vuser->session_info->user_session_key,
+ vuser->session_info->session_key,
response_blob);
}
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 722e4c7705..d727ee98b0 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -260,7 +260,7 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
session->do_signing = false;
}
- session->session_key = session->session_info->user_session_key;
+ session->session_key = session->session_info->session_key;
session->compat_vuser = talloc_zero(session, user_struct);
if (session->compat_vuser == NULL) {
@@ -466,7 +466,7 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct smbd_smb2_session *s
session->do_signing = false;
}
- session->session_key = session->session_info->user_session_key;
+ session->session_key = session->session_info->session_key;
session->compat_vuser = talloc_zero(session, user_struct);
if (session->compat_vuser == NULL) {