diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 22:46:09 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:56 +0100 |
commit | d891c0c74a03d797aed1c5ac0329fd9d1d78da63 (patch) | |
tree | 65d0966014ca2bcded71ece2319a7723b03c4d3d /source4/torture/rpc/samba3rpc.c | |
parent | 8f687a5faeaf779e88c54bea4f886eb8f410d448 (diff) | |
download | samba-d891c0c74a03d797aed1c5ac0329fd9d1d78da63.tar.gz samba-d891c0c74a03d797aed1c5ac0329fd9d1d78da63.tar.bz2 samba-d891c0c74a03d797aed1c5ac0329fd9d1d78da63.zip |
r26429: Avoid use of global_smb_iconv_convenience.
(This used to be commit d37136b7abfbba75ef2e5ab855eb3382b9648b8c)
Diffstat (limited to 'source4/torture/rpc/samba3rpc.c')
-rw-r--r-- | source4/torture/rpc/samba3rpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 496453e181..a63772e964 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -2314,7 +2314,7 @@ static NTSTATUS get_servername(TALLOC_CTX *mem_ctx, struct smbcli_tree *tree, memcpy(servername, r.out.info.info0.name, 16); servername[16] = '\0'; - if (pull_ascii_talloc(mem_ctx, global_smb_iconv_convenience, + if (pull_ascii_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), name, servername) < 0) { return NT_STATUS_NO_MEMORY; } |