summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-11-16 17:52:31 +0100
committerVolker Lendecke <vl@samba.org>2010-11-17 12:17:22 +0100
commit75f41c304a8ae65dbb81752d123cf95770a40d1a (patch)
tree62641690db1505df9656fb4d2ab6802cdbc5a133
parent5b0724d2289fbf14813636f1d5791ed76d56710e (diff)
downloadsamba-75f41c304a8ae65dbb81752d123cf95770a40d1a.tar.gz
samba-75f41c304a8ae65dbb81752d123cf95770a40d1a.tar.bz2
samba-75f41c304a8ae65dbb81752d123cf95770a40d1a.zip
s3: Remove a reference to "winbindd_cli_state" from append_afs_token
-rw-r--r--source3/winbindd/winbindd_pam.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 71c9e951fd..7f15441920 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -176,7 +176,7 @@ static NTSTATUS append_unix_username(TALLOC_CTX *mem_ctx,
}
static NTSTATUS append_afs_token(TALLOC_CTX *mem_ctx,
- struct winbindd_cli_state *state,
+ struct winbindd_response *resp,
const struct netr_SamInfo3 *info3,
const char *name_domain,
const char *name_user)
@@ -230,13 +230,11 @@ static NTSTATUS append_afs_token(TALLOC_CTX *mem_ctx,
if (token == NULL) {
return NT_STATUS_OK;
}
- state->response->extra_data.data = talloc_strdup(state->mem_ctx,
- token);
- if (state->response->extra_data.data == NULL) {
+ resp->extra_data.data = talloc_strdup(mem_ctx, token);
+ if (resp->extra_data.data == NULL) {
return NT_STATUS_NO_MEMORY;
}
- state->response->length +=
- strlen((const char *)state->response->extra_data.data)+1;
+ resp->length += strlen((const char *)resp->extra_data.data)+1;
return NT_STATUS_OK;
}
@@ -769,8 +767,8 @@ static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
}
if (request_flags & WBFLAG_PAM_AFS_TOKEN) {
- result = append_afs_token(state->mem_ctx, state, info3,
- name_domain, name_user);
+ result = append_afs_token(state->mem_ctx, state->response,
+ info3, name_domain, name_user);
if (!NT_STATUS_IS_OK(result)) {
DEBUG(10,("Failed to append AFS token: %s\n",
nt_errstr(result)));