git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3bfe676
)
s3: Remove a reference to "winbindd_cli_state" from append_info3_as_ndr
author
Volker Lendecke
<vl@samba.org>
Tue, 16 Nov 2010 16:50:16 +0000
(17:50 +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 ca509d2d488e64536a5eb6a8933dde03424ce5f1..71c9e951fd0e9829e31588a8aa55836231e291c6 100644
(file)
--- a/
source3/winbindd/winbindd_pam.c
+++ b/
source3/winbindd/winbindd_pam.c
@@
-122,7
+122,7
@@
static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx,
}
static NTSTATUS append_info3_as_ndr(TALLOC_CTX *mem_ctx,
}
static NTSTATUS append_info3_as_ndr(TALLOC_CTX *mem_ctx,
- struct winbindd_
cli_state *state
,
+ struct winbindd_
response *resp
,
struct netr_SamInfo3 *info3)
{
DATA_BLOB blob;
struct netr_SamInfo3 *info3)
{
DATA_BLOB blob;
@@
-135,8
+135,8
@@
static NTSTATUS append_info3_as_ndr(TALLOC_CTX *mem_ctx,
return ndr_map_error2ntstatus(ndr_err);
}
return ndr_map_error2ntstatus(ndr_err);
}
-
state->response
->extra_data.data = blob.data;
-
state->response
->length += blob.length;
+
resp
->extra_data.data = blob.data;
+
resp
->length += blob.length;
return NT_STATUS_OK;
}
return NT_STATUS_OK;
}
@@
-750,7
+750,8
@@
static NTSTATUS append_auth_data(struct winbindd_cli_state *state,
/* currently, anything from here on potentially overwrites extra_data. */
if (request_flags & WBFLAG_PAM_INFO3_NDR) {
/* currently, anything from here on potentially overwrites extra_data. */
if (request_flags & WBFLAG_PAM_INFO3_NDR) {
- result = append_info3_as_ndr(state->mem_ctx, state, info3);
+ result = append_info3_as_ndr(state->mem_ctx, state->response,
+ info3);
if (!NT_STATUS_IS_OK(result)) {
DEBUG(10,("Failed to append INFO3 (NDR): %s\n",
nt_errstr(result)));
if (!NT_STATUS_IS_OK(result)) {
DEBUG(10,("Failed to append INFO3 (NDR): %s\n",
nt_errstr(result)));