summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-13 22:46:27 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:50:02 +0100
commitd1e716cf4331bf09cfe15a6634bc5887aff81d20 (patch)
treed484509808c2e776db310c24d5658ba7dbd40857 /source4/utils
parent61873ce94c172c801a4831de5550a8e0fe54c5f5 (diff)
downloadsamba-d1e716cf4331bf09cfe15a6634bc5887aff81d20.tar.gz
samba-d1e716cf4331bf09cfe15a6634bc5887aff81d20.tar.bz2
samba-d1e716cf4331bf09cfe15a6634bc5887aff81d20.zip
r26432: Require ndr_pull users to specify iconv_convenience.
(This used to be commit 28b1d36551b75241c1cf9fca5d74f45a6dc884ab)
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/getntacl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/utils/getntacl.c b/source4/utils/getntacl.c
index 382a020c40..e1ab97b4d5 100644
--- a/source4/utils/getntacl.c
+++ b/source4/utils/getntacl.c
@@ -23,6 +23,7 @@
#include "system/filesys.h"
#include "librpc/gen_ndr/ndr_xattr.h"
#include "lib/util/wrap_xattr.h"
+#include "param/param.h"
static void ntacl_print_debug_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
@@ -71,7 +72,7 @@ static NTSTATUS get_ntacl(TALLOC_CTX *mem_ctx,
}
blob.length = size;
- ndr = ndr_pull_init_blob(&blob, NULL);
+ ndr = ndr_pull_init_blob(&blob, NULL, lp_iconv_convenience(global_loadparm));
ndr_err = ndr_pull_xattr_NTACL(ndr, NDR_SCALARS|NDR_BUFFERS, *ntacl);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {