diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:26:46 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:26:46 +0200 |
| commit | 37d885c51a559d2be7dd15f46a80027e4f1dffef (patch) | |
| tree | 5e6fd2f9fb3463f8694ee9b6b022d0878737e0e6 /source4/libcli/smb2 | |
| parent | 284f523ec70477c408887a478e8392671f12dfff (diff) | |
| download | samba-37d885c51a559d2be7dd15f46a80027e4f1dffef.tar.gz samba-37d885c51a559d2be7dd15f46a80027e4f1dffef.tar.bz2 samba-37d885c51a559d2be7dd15f46a80027e4f1dffef.zip | |
Remove iconv_convenience argument from convert_string{,talloc}() but
make them wrappers around convert_string{,talloc}_convenience().
Diffstat (limited to 'source4/libcli/smb2')
| -rw-r--r-- | source4/libcli/smb2/request.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c index cc355fc33e..0104d8e097 100644 --- a/source4/libcli/smb2/request.c +++ b/source4/libcli/smb2/request.c @@ -676,7 +676,7 @@ NTSTATUS smb2_pull_o16s16_string(struct smb2_request_buffer *buf, TALLOC_CTX *me return NT_STATUS_OK; } - size = convert_string_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, + size = convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX, blob.data, blob.length, &vstr); data_blob_free(&blob); (*str) = (char *)vstr; @@ -707,7 +707,7 @@ NTSTATUS smb2_push_o16s16_string(struct smb2_request_buffer *buf, return smb2_push_o16s16_blob(buf, ofs, blob); } - size = convert_string_talloc(buf->buffer, lp_iconv_convenience(global_loadparm), CH_UNIX, CH_UTF16, + size = convert_string_talloc(buf->buffer, CH_UNIX, CH_UTF16, str, strlen(str), (void **)&blob.data); if (size == -1) { return NT_STATUS_ILLEGAL_CHARACTER; |