diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 17:52:23 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:30 +0100 |
| commit | 39ee38d9c1aabf4db065b433d067d0da053d7d61 (patch) | |
| tree | 5c827c09374873fe386c28ef51415d81a49c939a /source4/libcli/smb2 | |
| parent | b440ed3df31b11d520c6d744cf53c54165f61b7a (diff) | |
| download | samba-39ee38d9c1aabf4db065b433d067d0da053d7d61.tar.gz samba-39ee38d9c1aabf4db065b433d067d0da053d7d61.tar.bz2 samba-39ee38d9c1aabf4db065b433d067d0da053d7d61.zip | |
r26316: Use contexts for conversion functions.
(This used to be commit f6420d933b5b011d428974f3a2a57edf19e6f482)
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 576e2b6fcf..5a7534f906 100644 --- a/source4/libcli/smb2/request.c +++ b/source4/libcli/smb2/request.c @@ -579,7 +579,7 @@ NTSTATUS smb2_pull_o16s16_string(struct smb2_request_buffer *buf, TALLOC_CTX *me return NT_STATUS_OK; } - size = convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX, + size = convert_string_talloc(mem_ctx, global_smb_iconv_convenience, CH_UTF16, CH_UNIX, blob.data, blob.length, &vstr); data_blob_free(&blob); (*str) = (char *)vstr; @@ -604,7 +604,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, CH_UNIX, CH_UTF16, + size = convert_string_talloc(buf->buffer, global_smb_iconv_convenience, CH_UNIX, CH_UTF16, str, strlen(str), (void **)&blob.data); if (size == -1) { return NT_STATUS_ILLEGAL_CHARACTER; |