diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 23:23:25 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:09 +0100 |
| commit | 84b476394713d4f2b84782c59dcc084a25af360f (patch) | |
| tree | 592fe90a816f31414528148254d616ad8fe6b63a /source4/utils | |
| parent | e31abef15f7696cf39e9e81307f153da93568e02 (diff) | |
| download | samba-84b476394713d4f2b84782c59dcc084a25af360f.tar.gz samba-84b476394713d4f2b84782c59dcc084a25af360f.tar.bz2 samba-84b476394713d4f2b84782c59dcc084a25af360f.zip | |
r26441: Remove global_loadparm uses.
(This used to be commit 32007c6277efa46341da7741b749a98633d71640)
Diffstat (limited to 'source4/utils')
| -rw-r--r-- | source4/utils/getntacl.c | 2 | ||||
| -rw-r--r-- | source4/utils/ntlm_auth.c | 3 |
2 files changed, 3 insertions, 2 deletions
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); } |