summaryrefslogtreecommitdiff
path: root/source4/winbind/wb_pam_auth.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-28 18:27:29 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-28 18:27:29 +0100
commitfc6bc92e116d3891671a77bc4564047eefd69f95 (patch)
tree9fd31f538af9cea9f144ece7e7b7cd2333d2bd81 /source4/winbind/wb_pam_auth.c
parentd70eafc5c635255feafc7121b381e7044ac11854 (diff)
parentafe8e533b9626fff8c59653972019d3f91bf136c (diff)
downloadsamba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.gz
samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.bz2
samba-fc6bc92e116d3891671a77bc4564047eefd69f95.zip
Merge branch 'v4-0-trivial' into v4-0-test
(This used to be commit 6cbb241c05539cc62526a366094c9c472e6422a5)
Diffstat (limited to 'source4/winbind/wb_pam_auth.c')
-rw-r--r--source4/winbind/wb_pam_auth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c
index 0073e3fdf8..62744297c6 100644
--- a/source4/winbind/wb_pam_auth.c
+++ b/source4/winbind/wb_pam_auth.c
@@ -143,7 +143,7 @@ static void pam_auth_crap_recv_logon(struct composite_context *ctx)
if (!composite_is_ok(state->ctx)) return;
ndr_err = ndr_push_struct_blob(
- &tmp_blob, state, lp_iconv_convenience(global_loadparm),
+ &tmp_blob, state, lp_iconv_convenience(state->lp_ctx),
state->req->out.validation.sam3,
(ndr_push_flags_fn_t)ndr_push_netr_SamInfo3);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {