From 84b476394713d4f2b84782c59dcc084a25af360f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 13 Dec 2007 23:23:25 +0100 Subject: r26441: Remove global_loadparm uses. (This used to be commit 32007c6277efa46341da7741b749a98633d71640) --- source4/utils/getntacl.c | 2 +- source4/utils/ntlm_auth.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/utils') diff --git a/source4/utils/getntacl.c b/source4/utils/getntacl.c index e1ab97b4d5..132d689dcb 100644 --- a/source4/utils/getntacl.c +++ b/source4/utils/getntacl.c @@ -72,7 +72,7 @@ static NTSTATUS get_ntacl(TALLOC_CTX *mem_ctx, } blob.length = size; - ndr = ndr_pull_init_blob(&blob, NULL, lp_iconv_convenience(global_loadparm)); + ndr = ndr_pull_init_blob(&blob, NULL, NULL); ndr_err = ndr_pull_xattr_NTACL(ndr, NDR_SCALARS|NDR_BUFFERS, *ntacl); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index 299be37765..b224689d70 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -471,7 +471,8 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, if (!ev) { exit(1); } - msg = messaging_client_init(state, lp_messaging_path(state, lp_ctx), ev); + msg = messaging_client_init(state, lp_messaging_path(state, lp_ctx), + lp_iconv_convenience(lp_ctx), ev); if (!msg) { exit(1); } -- cgit