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/libcli/smb2 | |
| 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/libcli/smb2')
| -rw-r--r-- | source4/libcli/smb2/request.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c index 5a7534f906..73c74dcfeb 100644 --- a/source4/libcli/smb2/request.c +++ b/source4/libcli/smb2/request.c @@ -26,6 +26,7 @@ #include "lib/util/dlinklist.h" #include "lib/events/events.h" #include "libcli/smb2/smb2_calls.h" +#include "param/param.h" /* initialise a smb2 request @@ -579,7 +580,7 @@ NTSTATUS smb2_pull_o16s16_string(struct smb2_request_buffer *buf, TALLOC_CTX *me return NT_STATUS_OK; } - size = convert_string_talloc(mem_ctx, global_smb_iconv_convenience, CH_UTF16, CH_UNIX, + size = convert_string_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, blob.data, blob.length, &vstr); data_blob_free(&blob); (*str) = (char *)vstr; @@ -604,7 +605,7 @@ NTSTATUS smb2_push_o16s16_string(struct smb2_request_buffer *buf, return smb2_push_o16s16_blob(buf, ofs, data_blob(NULL, 0)); } - size = convert_string_talloc(buf->buffer, global_smb_iconv_convenience, CH_UNIX, CH_UTF16, + size = convert_string_talloc(buf->buffer, lp_iconv_convenience(global_loadparm), CH_UNIX, CH_UTF16, str, strlen(str), (void **)&blob.data); if (size == -1) { return NT_STATUS_ILLEGAL_CHARACTER; |