s3-auth Rename user_session_key -> session_key to match auth_session_info

6 files changed, 16 insertions, 16 deletions

diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index 5f028e6507..9ea872b027 100644
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -1751,7 +1751,7 @@ NTSTATUS _lsa_CreateTrustedDomainEx2(struct pipes_struct *p,
 		auth_blob.data = r->in.auth_info->auth_blob.data;
 
 		arcfour_crypt_blob(auth_blob.data, auth_blob.length,
-				   &p->session_info->user_session_key);
+				   &p->session_info->session_key);
 
 		ndr_err = ndr_pull_struct_blob(&auth_blob, p->mem_ctx,
 					       &auth_struct,
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index b17cfa2ffa..f0535c7295 100644
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -1165,7 +1165,7 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
 
 	in = data_blob_const(nt_hash->hash, 16);
 	out = data_blob_talloc_zero(mem_ctx, 16);
-	sess_crypt_blob(&out, &in, &session_info->user_session_key, true);
+	sess_crypt_blob(&out, &in, &session_info->session_key, true);
 	memcpy(info18.nt_pwd.hash, out.data, out.length);
 
 	info18.nt_pwd_active = true;
diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index 855eece538..f000b64f71 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -659,7 +659,7 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx,
 
 	/* Send the named_pipe_auth server the user's full token */
 	session_info_t->security_token = session_info->security_token;
-	session_info_t->session_key = session_info->user_session_key;
+	session_info_t->session_key = session_info->session_key;
 
 	val.sam3 = session_info->info3;
 
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 9934e196cc..2fa2a77112 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -51,7 +51,7 @@ static NTSTATUS auth_anonymous_session_info(TALLOC_CTX *mem_ctx,
 	}
 
 	i->security_token = s->security_token;
-	i->session_key    = s->user_session_key;
+	i->session_key    = s->session_key;
 
 	val.sam3 = s->info3;
 
diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 334a8846a4..99dd3f4d58 100644
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -5159,7 +5159,7 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
 			/* Used by AS/U JRA. */
 			status = set_user_info_18(&info->info18,
 						  p->mem_ctx,
-						  &p->session_info->user_session_key,
+						  &p->session_info->session_key,
 						  pwd);
 			break;
 
@@ -5171,16 +5171,16 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
 		case 21:
 			status = set_user_info_21(&info->info21,
 						  p->mem_ctx,
-						  &p->session_info->user_session_key,
+						  &p->session_info->session_key,
 						  pwd);
 			break;
 
 		case 23:
-			if (!p->session_info->user_session_key.length) {
+			if (!p->session_info->session_key.length) {
 				status = NT_STATUS_NO_USER_SESSION_KEY;
 			}
 			arcfour_crypt_blob(info->info23.password.data, 516,
-					   &p->session_info->user_session_key);
+					   &p->session_info->session_key);
 
 			dump_data(100, info->info23.password.data, 516);
 
@@ -5191,12 +5191,12 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
 			break;
 
 		case 24:
-			if (!p->session_info->user_session_key.length) {
+			if (!p->session_info->session_key.length) {
 				status = NT_STATUS_NO_USER_SESSION_KEY;
 			}
 			arcfour_crypt_blob(info->info24.password.data,
 					   516,
-					   &p->session_info->user_session_key);
+					   &p->session_info->session_key);
 
 			dump_data(100, info->info24.password.data, 516);
 
@@ -5206,12 +5206,12 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
 			break;
 
 		case 25:
-			if (!p->session_info->user_session_key.length) {
+			if (!p->session_info->session_key.length) {
 				status = NT_STATUS_NO_USER_SESSION_KEY;
 			}
 			encode_or_decode_arc4_passwd_buffer(
 				info->info25.password.data,
-				&p->session_info->user_session_key);
+				&p->session_info->session_key);
 
 			dump_data(100, info->info25.password.data, 532);
 
@@ -5221,12 +5221,12 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
 			break;
 
 		case 26:
-			if (!p->session_info->user_session_key.length) {
+			if (!p->session_info->session_key.length) {
 				status = NT_STATUS_NO_USER_SESSION_KEY;
 			}
 			encode_or_decode_arc4_passwd_buffer(
 				info->info26.password.data,
-				&p->session_info->user_session_key);
+				&p->session_info->session_key);
 
 			dump_data(100, info->info26.password.data, 516);
 
diff --git a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
index 9459599cc6..d44414f776 100644
--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
@@ -842,7 +842,7 @@ WERROR _wkssvc_NetrJoinDomain2(struct pipes_struct *p,
 
 	werr = decode_wkssvc_join_password_buffer(
 		p->mem_ctx, r->in.encrypted_password,
-		&p->session_info->user_session_key, &cleartext_pwd);
+		&p->session_info->session_key, &cleartext_pwd);
 	if (!W_ERROR_IS_OK(werr)) {
 		return werr;
 	}
@@ -908,7 +908,7 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct pipes_struct *p,
 
 	werr = decode_wkssvc_join_password_buffer(
 		p->mem_ctx, r->in.encrypted_password,
-		&p->session_info->user_session_key, &cleartext_pwd);
+		&p->session_info->session_key, &cleartext_pwd);
 	if (!W_ERROR_IS_OK(werr)) {
 		return werr;
 	}