sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3: Remove a reference to "winbindd_cli_state" from append_auth_data

Browse Source 
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Nov 17 12:02:34 UTC 2010 on sn-devel-104
This commit is contained in:
Volker Lendecke 2010-11-16 17:58:10 +01:00 committed by Volker Lendecke
parent bdf830ac61
commit d1c1aaeb8b
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source3/winbindd/winbindd_pam.c
View File

@ -713,7 +713,8 @@ bool check_request_flags(uint32_t flags)
/**************************************************************** /****************************************************************
****************************************************************/ ****************************************************************/
static NTSTATUS append_auth_data(struct winbindd_cli_state *state, static NTSTATUS append_auth_data(TALLOC_CTX *mem_ctx,
struct winbindd_response *resp,
uint32_t request_flags, uint32_t request_flags,
struct netr_SamInfo3 *info3, struct netr_SamInfo3 *info3,
const char *name_domain, const char *name_domain,
@ -722,21 +723,21 @@ static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
NTSTATUS result; NTSTATUS result;
if (request_flags & WBFLAG_PAM_USER_SESSION_KEY) { if (request_flags & WBFLAG_PAM_USER_SESSION_KEY) {
memcpy(state->response->data.auth.user_session_key, memcpy(resp->data.auth.user_session_key,
info3->base.key.key, info3->base.key.key,
sizeof(state->response->data.auth.user_session_key) sizeof(resp->data.auth.user_session_key)
/* 16 */); /* 16 */);
} }
if (request_flags & WBFLAG_PAM_LMKEY) { if (request_flags & WBFLAG_PAM_LMKEY) {
memcpy(state->response->data.auth.first_8_lm_hash, memcpy(resp->data.auth.first_8_lm_hash,
info3->base.LMSessKey.key, info3->base.LMSessKey.key,
sizeof(state->response->data.auth.first_8_lm_hash) sizeof(resp->data.auth.first_8_lm_hash)
/* 8 */); /* 8 */);
} }
if (request_flags & WBFLAG_PAM_UNIX_NAME) { if (request_flags & WBFLAG_PAM_UNIX_NAME) {
result = append_unix_username(state->mem_ctx, state->response, result = append_unix_username(mem_ctx, resp,
info3, name_domain, name_user); info3, name_domain, name_user);
if (!NT_STATUS_IS_OK(result)) { if (!NT_STATUS_IS_OK(result)) {
DEBUG(10,("Failed to append Unix Username: %s\n", DEBUG(10,("Failed to append Unix Username: %s\n",
@ -748,8 +749,7 @@ static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
/* currently, anything from here on potentially overwrites extra_data. */ /* currently, anything from here on potentially overwrites extra_data. */
if (request_flags & WBFLAG_PAM_INFO3_NDR) { if (request_flags & WBFLAG_PAM_INFO3_NDR) {
result = append_info3_as_ndr(state->mem_ctx, state->response, result = append_info3_as_ndr(mem_ctx, resp, info3);
info3);
if (!NT_STATUS_IS_OK(result)) { if (!NT_STATUS_IS_OK(result)) {
DEBUG(10,("Failed to append INFO3 (NDR): %s\n", DEBUG(10,("Failed to append INFO3 (NDR): %s\n",
nt_errstr(result))); nt_errstr(result)));
@ -758,8 +758,7 @@ static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
} }
if (request_flags & WBFLAG_PAM_INFO3_TEXT) { if (request_flags & WBFLAG_PAM_INFO3_TEXT) {
result = append_info3_as_txt(state->mem_ctx, state->response, result = append_info3_as_txt(mem_ctx, resp, info3);
info3);
if (!NT_STATUS_IS_OK(result)) { if (!NT_STATUS_IS_OK(result)) {
DEBUG(10,("Failed to append INFO3 (TXT): %s\n", DEBUG(10,("Failed to append INFO3 (TXT): %s\n",
nt_errstr(result))); nt_errstr(result)));
@ -768,7 +767,7 @@ static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
} }
if (request_flags & WBFLAG_PAM_AFS_TOKEN) { if (request_flags & WBFLAG_PAM_AFS_TOKEN) {
result = append_afs_token(state->mem_ctx, state->response, result = append_afs_token(mem_ctx, resp,
info3, name_domain, name_user); info3, name_domain, name_user);
if (!NT_STATUS_IS_OK(result)) { if (!NT_STATUS_IS_OK(result)) {
DEBUG(10,("Failed to append AFS token: %s\n", DEBUG(10,("Failed to append AFS token: %s\n",
@ -1574,7 +1573,8 @@ process_result:
goto done; goto done;
} }
result = append_auth_data(state, state->request->flags, info3, result = append_auth_data(state->mem_ctx, state->response,
state->request->flags, info3,
name_domain, name_user); name_domain, name_user);
if (!NT_STATUS_IS_OK(result)) { if (!NT_STATUS_IS_OK(result)) {
goto done; goto done;
@ -1781,7 +1781,8 @@ process_result:
goto done; goto done;
} }
result = append_auth_data(state, state->request->flags, info3, result = append_auth_data(state->mem_ctx, state->response,
state->request->flags, info3,
name_domain, name_user); name_domain, name_user);
if (!NT_STATUS_IS_OK(result)) { if (!NT_STATUS_IS_OK(result)) {
goto done; goto done;