summaryrefslogtreecommitdiff
path: root/source4/torture/rap
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-13 22:46:47 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:50:07 +0100
commit5e00673a4063c9a51580a36ba1f824bd8ea0de66 (patch)
tree6b5547cc28b05a97062df284d04db41135bf573d /source4/torture/rap
parente8f46760e0134c45cd2b6b27aef60622c4bf58fa (diff)
downloadsamba-5e00673a4063c9a51580a36ba1f824bd8ea0de66.tar.gz
samba-5e00673a4063c9a51580a36ba1f824bd8ea0de66.tar.bz2
samba-5e00673a4063c9a51580a36ba1f824bd8ea0de66.zip
r26438: Store iconv convenience in tdr push contexts.
(This used to be commit dffef3162778aebe2f8d77e2da60b22adb7d60ef)
Diffstat (limited to 'source4/torture/rap')
-rw-r--r--source4/torture/rap/rap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 5294e00df9..9deb53086a 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -183,7 +183,7 @@ static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr,
return NT_STATUS_INVALID_PARAMETER;
*dest = talloc_zero_array(mem_ctx, char, len+1);
- pull_string(lp_iconv_convenience(global_loadparm), *dest, p, len+1, len, STR_ASCII);
+ pull_string(ndr->iconv_convenience, *dest, p, len+1, len, STR_ASCII);
return NT_STATUS_OK;
}