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/rap/rap.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/rap/rap.c')
| -rw-r--r-- | source4/torture/rap/rap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index 7ef2555800..d39a83034d 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -26,6 +26,7 @@ #include "libcli/raw/libcliraw.h" #include "libcli/libcli.h" #include "librpc/ndr/libndr.h" +#include "param/param.h" #define RAP_GOTO(call) do { \ NTSTATUS _status; \ @@ -182,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(global_smb_iconv_convenience, *dest, p, len+1, len, STR_ASCII); + pull_string(lp_iconv_convenience(global_loadparm), *dest, p, len+1, len, STR_ASCII); return NT_STATUS_OK; } |