git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5b0724d
)
s3: Remove a reference to "winbindd_cli_state" from append_afs_token
author
Volker Lendecke
<vl@samba.org>
Tue, 16 Nov 2010 16:52:31 +0000
(17:52 +0100)
committer
Volker Lendecke
<vl@samba.org>
Wed, 17 Nov 2010 11:17:22 +0000
(12:17 +0100)
source3/winbindd/winbindd_pam.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/winbindd_pam.c
b/source3/winbindd/winbindd_pam.c
index 71c9e951fd0e9829e31588a8aa55836231e291c6..7f154419203d862df77c63c11bdc52b7ffff7a4a 100644
(file)
--- 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,
}
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)
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;
}
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;
}
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;
}
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) {
}
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)));
if (!NT_STATUS_IS_OK(result)) {
DEBUG(10,("Failed to append AFS token: %s\n",
nt_errstr(result)));