diff options
Diffstat (limited to 'source3/auth')
| -rw-r--r-- | source3/auth/auth_ntlmssp.c | 12 | ||||
| -rw-r--r-- | source3/auth/auth_sam.c | 2 | ||||
| -rw-r--r-- | source3/auth/auth_util.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c index 498a7b1a39..4b425056b1 100644 --- a/source3/auth/auth_ntlmssp.c +++ b/source3/auth/auth_ntlmssp.c @@ -75,7 +75,7 @@ static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state, * Return the session keys used on the connection. */ -static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key) +static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) { AUTH_NTLMSSP_STATE *auth_ntlmssp_state = ntlmssp_state->auth_context; auth_usersupplied_info *user_info = NULL; @@ -113,11 +113,11 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, if (!NT_STATUS_IS_OK(nt_status)) { return nt_status; } - if (auth_ntlmssp_state->server_info->nt_session_key.length) { - DEBUG(10, ("Got NT session key of length %u\n", auth_ntlmssp_state->server_info->nt_session_key.length)); - *nt_session_key = data_blob_talloc(auth_ntlmssp_state->mem_ctx, - auth_ntlmssp_state->server_info->nt_session_key.data, - auth_ntlmssp_state->server_info->nt_session_key.length); + if (auth_ntlmssp_state->server_info->user_session_key.length) { + DEBUG(10, ("Got NT session key of length %u\n", auth_ntlmssp_state->server_info->user_session_key.length)); + *user_session_key = data_blob_talloc(auth_ntlmssp_state->mem_ctx, + auth_ntlmssp_state->server_info->user_session_key.data, + auth_ntlmssp_state->server_info->user_session_key.length); } if (auth_ntlmssp_state->server_info->lm_session_key.length) { DEBUG(10, ("Got LM session key of length %u\n", auth_ntlmssp_state->server_info->lm_session_key.length)); diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c index 5efc51b21a..2f9ff6265c 100644 --- a/source3/auth/auth_sam.c +++ b/source3/auth/auth_sam.c @@ -261,7 +261,7 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context, return nt_status; } - (*server_info)->nt_session_key = user_sess_key; + (*server_info)->user_session_key = user_sess_key; (*server_info)->lm_session_key = lm_sess_key; return nt_status; diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 9df5873983..3f1ac9c975 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -912,7 +912,7 @@ NTSTATUS make_server_info_guest(auth_serversupplied_info **server_info) /* annoying, but the Guest really does have a session key, and it is all zeros! */ - (*server_info)->nt_session_key = data_blob(zeros, sizeof(zeros)); + (*server_info)->user_session_key = data_blob(zeros, sizeof(zeros)); (*server_info)->lm_session_key = data_blob(zeros, sizeof(zeros)); } @@ -1276,9 +1276,9 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx, /* ensure we are never given NULL session keys */ if (memcmp(info3->user_sess_key, zeros, sizeof(zeros)) == 0) { - (*server_info)->nt_session_key = data_blob(NULL, 0); + (*server_info)->user_session_key = data_blob(NULL, 0); } else { - (*server_info)->nt_session_key = data_blob(info3->user_sess_key, sizeof(info3->user_sess_key)); + (*server_info)->user_session_key = data_blob(info3->user_sess_key, sizeof(info3->user_sess_key)); } if (memcmp(info3->padding, zeros, sizeof(zeros)) == 0) { @@ -1330,7 +1330,7 @@ void free_server_info(auth_serversupplied_info **server_info) SAFE_FREE((*server_info)->groups); SAFE_FREE((*server_info)->unix_name); data_blob_free(&(*server_info)->lm_session_key); - data_blob_free(&(*server_info)->nt_session_key); + data_blob_free(&(*server_info)->user_session_key); ZERO_STRUCT(**server_info); } SAFE_FREE(*server_info); |