s3-auth Rename user_session_key -> session_key to match auth_session_info

diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 502c45840d4e29b6b25c11cd667cef0bd0375a20..7594110d9aeccc2aee373b6fcfecd5592817f9a5 100644 (file)
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -100,7 +100,7 @@ static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state,
  */
 
 static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, TALLOC_CTX *mem_ctx,
-                                           DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key)
+                                           DATA_BLOB *session_key, DATA_BLOB *lm_session_key)
 {
        struct auth_ntlmssp_state *auth_ntlmssp_state =
                (struct auth_ntlmssp_state *)ntlmssp_state->callback_private;
@@ -152,12 +152,12 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
         * NTLMSSP code will decide on the final correct session key,
         * and put it back here at the end of
         * auth_ntlmssp_steal_server_info */
-       if (auth_ntlmssp_state->server_info->user_session_key.length) {
+       if (auth_ntlmssp_state->server_info->session_key.length) {
                DEBUG(10, ("Got NT session key of length %u\n",
-                       (unsigned int)auth_ntlmssp_state->server_info->user_session_key.length));
-               *user_session_key = auth_ntlmssp_state->server_info->user_session_key;
-               talloc_steal(mem_ctx, auth_ntlmssp_state->server_info->user_session_key.data);
-               auth_ntlmssp_state->server_info->user_session_key = data_blob_null;
+                       (unsigned int)auth_ntlmssp_state->server_info->session_key.length));
+               *session_key = auth_ntlmssp_state->server_info->session_key;
+               talloc_steal(mem_ctx, auth_ntlmssp_state->server_info->session_key.data);
+               auth_ntlmssp_state->server_info->session_key = data_blob_null;
        }
        if (auth_ntlmssp_state->server_info->lm_session_key.length) {
                DEBUG(10, ("Got LM session key of length %u\n",

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 01b9a3597929b9349c7777cc387c3f826beaef23..d865ecb9f397db95b7dc4b16d37e082b69c0610c 100644 (file)
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -461,11 +461,11 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
        }
        
        if (session_key) {
-               data_blob_free(&session_info->user_session_key);
-               session_info->user_session_key = data_blob_talloc(session_info, 
+               data_blob_free(&session_info->session_key);
+               session_info->session_key = data_blob_talloc(session_info, 
                                                                  session_key->data, 
                                                                  session_key->length);
-               if (!session_info->user_session_key.data && session_key->length) {
+               if (!session_info->session_key.data && session_key->length) {
                        return NT_STATUS_NO_MEMORY;
                }
        }
@@ -782,7 +782,7 @@ static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **ses
 
        /* annoying, but the Guest really does have a session key, and it is
           all zeros! */
-       (*session_info)->user_session_key = data_blob(zeros, sizeof(zeros));
+       (*session_info)->session_key = data_blob(zeros, sizeof(zeros));
        (*session_info)->lm_session_key = data_blob(zeros, sizeof(zeros));
 
        alpha_strcpy(tmp, (*session_info)->info3->base.account_name.string,
@@ -903,8 +903,8 @@ struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
                }
        }
 
-       dst->user_session_key = data_blob_talloc( dst, src->user_session_key.data,
-                                               src->user_session_key.length);
+       dst->session_key = data_blob_talloc( dst, src->session_key.data,
+                                               src->session_key.length);
 
        dst->lm_session_key = data_blob_talloc(dst, src->lm_session_key.data,
                                                src->lm_session_key.length);
@@ -939,12 +939,12 @@ struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
 bool session_info_set_session_key(struct auth_serversupplied_info *info,
                                 DATA_BLOB session_key)
 {
-       TALLOC_FREE(info->user_session_key.data);
+       TALLOC_FREE(info->session_key.data);
 
-       info->user_session_key = data_blob_talloc(
+       info->session_key = data_blob_talloc(
                info, session_key.data, session_key.length);
 
-       return (info->user_session_key.data != NULL);
+       return (info->session_key.data != NULL);
 }
 
 static struct auth_serversupplied_info *guest_info = NULL;
@@ -1289,9 +1289,9 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
        /* ensure we are never given NULL session keys */
 
        if (memcmp(info3->base.key.key, zeros, sizeof(zeros)) == 0) {
-               result->user_session_key = data_blob_null;
+               result->session_key = data_blob_null;
        } else {
-               result->user_session_key = data_blob_talloc(
+               result->session_key = data_blob_talloc(
                        result, info3->base.key.key,
                        sizeof(info3->base.key.key));
        }

diff --git a/source3/auth/check_samsec.c b/source3/auth/check_samsec.c
index 299f43a1e995c95e5c61e1fe1857b497d5eb32e5..d6652c45ae118ed43194e4707390d274256fe334 100644 (file)
--- a/source3/auth/check_samsec.c
+++ b/source3/auth/check_samsec.c
@@ -490,7 +490,7 @@ NTSTATUS check_sam_security(const DATA_BLOB *challenge,
                goto done;
        }
 
-       (*server_info)->user_session_key =
+       (*server_info)->session_key =
                data_blob_talloc(*server_info, user_sess_key.data,
                                 user_sess_key.length);
        data_blob_free(&user_sess_key);

diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index e218ca9f7f3a3d82674f05f0e00d8c0d33d2a361..a4bb035e80620b1f7684651da262443d816b831f 100644 (file)
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -77,11 +77,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);
@@ -120,11 +120,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);
@@ -178,11 +178,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);

diff --git a/source3/include/auth.h b/source3/include/auth.h
index 3b3f6dc6d1b4584468404e6006879f68ca2c3d2a..61ad500690a7fbf136464fe353fd8f8bac1132ca 100644 (file)
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -46,7 +46,7 @@ struct auth_serversupplied_info {
         * Bottom line, it is not the same as the session keys in info3.
         */
 
-       DATA_BLOB user_session_key;
+       DATA_BLOB session_key;
        DATA_BLOB lm_session_key;
 
        struct netr_SamInfo3 *info3;

diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index 7e7399cf992658dd1db739492a6ada59a1e4bf0b..a6205cd2a51075bea42986667290c093a56b776b 100644 (file)
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -1752,7 +1752,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 8e766328f586e96d979be0a30a28524f25a09978..7b06e2df528a9cb006d9ad08fd5736e312adf9d6 100644 (file)
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -1160,7 +1160,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 5e4846c4aa71f8453e5d006149d79b609dc3d568..818a459a03ed33870a95f93d1242c452b0517f0c 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -650,7 +650,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/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 57965cda7416171525f5e496a2dceb3ac881d1d4..03957f46619d05fbfe30c892861f3e6f356c787b 100644 (file)
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -5267,7 +5267,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;
 
@@ -5279,16 +5279,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);
 
@@ -5299,12 +5299,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);
 
@@ -5314,12 +5314,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);
 
@@ -5329,12 +5329,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 205f7601e1c44487ccb9fd5b6d79f739218c2507..4a75f7424f7fec663d26f0e0a39716593bf53abf 100644 (file)
--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
@@ -838,7 +838,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;
        }
@@ -904,7 +904,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;
        }

diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 376814ada81ca899da0edd7daf3e6d5c62d7e798..7fd0e8178714e2769c56223ec4eb409a479d9084 100644 (file)
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -330,7 +330,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 76dfdebd90fb443b6b05e1f5933ef8c2a1b1c5ab..463b36b393d9913145b68b228b595dc89a551ef6 100644 (file)
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -259,7 +259,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) {
@@ -465,7 +465,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) {