diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 14:16:02 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 14:16:02 +0100 |
| commit | 37deca2d41d74faa7abe060a21340263bd6d66f7 (patch) | |
| tree | 6518c1de676c2ceb9358128fc6a7ff8900186499 /source4/lib/tdr/tdr.c | |
| parent | ee6f838d3a5aaa54b105249391aae89803901a2e (diff) | |
| download | samba-37deca2d41d74faa7abe060a21340263bd6d66f7.tar.gz samba-37deca2d41d74faa7abe060a21340263bd6d66f7.tar.bz2 samba-37deca2d41d74faa7abe060a21340263bd6d66f7.zip | |
Avoid use of global_loadparm.
(This used to be commit c5a95bbe0ce55c29e135a9c6058bf192ec3bb546)
Diffstat (limited to 'source4/lib/tdr/tdr.c')
| -rw-r--r-- | source4/lib/tdr/tdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/tdr/tdr.c b/source4/lib/tdr/tdr.c index f75cac9810..2ad099174d 100644 --- a/source4/lib/tdr/tdr.c +++ b/source4/lib/tdr/tdr.c @@ -154,7 +154,7 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, TDR_PULL_NEED_BYTES(tdr, el_size*length); - ret = convert_string_talloc(ctx, lp_iconv_convenience(global_loadparm), chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v)); + ret = convert_string_talloc(ctx, tdr->iconv_convenience, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v)); if (ret == -1) { return NT_STATUS_INVALID_PARAMETER; |