summaryrefslogtreecommitdiff
path: root/source4/auth/auth_winbind.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-02 18:39:01 -0600
committerStefan Metzmacher <metze@samba.org>2008-01-02 12:48:03 -0600
commit771b347f9b185895390445be96081c781e28a26d (patch)
tree8cbd2b1276c18583af2ade0bc67cc181a11490ad /source4/auth/auth_winbind.c
parent37b822e49f3f7a29950ff6f52cfebf72dd583db9 (diff)
downloadsamba-771b347f9b185895390445be96081c781e28a26d.tar.gz
samba-771b347f9b185895390445be96081c781e28a26d.tar.bz2
samba-771b347f9b185895390445be96081c781e28a26d.zip
r26644: Janitorial: Pass resolve_context explicitly to various SMB functions, should help fix the build for OpenChange.
(This used to be commit 385ffe4f4cc9a21a760c0f00410f56e2592fd507)
Diffstat (limited to 'source4/auth/auth_winbind.c')
-rw-r--r--source4/auth/auth_winbind.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/auth/auth_winbind.c b/source4/auth/auth_winbind.c
index bfbcbbfd5d..89ae3195df 100644
--- a/source4/auth/auth_winbind.c
+++ b/source4/auth/auth_winbind.c
@@ -29,7 +29,7 @@
#include "lib/messaging/irpc.h"
#include "param/param.h"
-static NTSTATUS get_info3_from_ndr(TALLOC_CTX *mem_ctx, struct winbindd_response *response, struct netr_SamInfo3 *info3)
+static NTSTATUS get_info3_from_ndr(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, struct winbindd_response *response, struct netr_SamInfo3 *info3)
{
size_t len = response->length - sizeof(struct winbindd_response);
if (len > 4) {
@@ -39,7 +39,7 @@ static NTSTATUS get_info3_from_ndr(TALLOC_CTX *mem_ctx, struct winbindd_response
blob.data = (uint8_t *)(((char *)response->extra_data.data) + 4);
ndr_err = ndr_pull_struct_blob(&blob, mem_ctx,
- lp_iconv_convenience(global_loadparm), info3,
+ iconv_convenience, info3,
(ndr_pull_flags_fn_t)ndr_pull_netr_SamInfo3);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return ndr_map_error2ntstatus(ndr_err);
@@ -122,7 +122,7 @@ static NTSTATUS winbind_check_password_samba3(struct auth_method_context *ctx,
if (result == NSS_STATUS_SUCCESS && response.extra_data.data) {
union netr_Validation validation;
- nt_status = get_info3_from_ndr(mem_ctx, &response, &info3);
+ nt_status = get_info3_from_ndr(mem_ctx, lp_iconv_convenience(ctx->auth_ctx->lp_ctx), &response, &info3);
SAFE_FREE(response.extra_data.data);
NT_STATUS_NOT_OK_RETURN(nt_status);