diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-03-24 10:59:41 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-03-24 01:47:26 +0100 |
| commit | 15e84a9a09c5a86416e964a3258ee35718fbf45a (patch) | |
| tree | a3c1d6698668e55b257c96fe2cace1ac7c8edb3a /source3/libsmb/clifile.c | |
| parent | 451856698fc04a9426ec9cb1ec039574f82f56bb (diff) | |
| download | samba-15e84a9a09c5a86416e964a3258ee35718fbf45a.tar.gz samba-15e84a9a09c5a86416e964a3258ee35718fbf45a.tar.bz2 samba-15e84a9a09c5a86416e964a3258ee35718fbf45a.zip | |
charcnv: removed the allow_badcharcnv and allow_bad_conv options to convert_string*()
we shouldn't accept bad multi-byte strings, it just hides problems
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Mar 24 01:47:26 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/libsmb/clifile.c')
| -rw-r--r-- | source3/libsmb/clifile.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 72f0e4b8eb..fcf31561be 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -58,7 +58,7 @@ static uint8_t *internal_bytes_push_str(uint8_t *buf, bool ucs2, if (!convert_string_talloc(talloc_tos(), CH_UNIX, ucs2 ? CH_UTF16LE : CH_DOS, str, str_len, &converted, - &converted_size, true)) { + &converted_size)) { return NULL; } @@ -445,8 +445,7 @@ NTSTATUS cli_posix_readlink_recv(struct tevent_req *req, struct cli_state *cli, state->data, state->num_data, &converted, - &converted_size, - true)) { + &converted_size)) { return NT_STATUS_NO_MEMORY; } @@ -5417,7 +5416,7 @@ NTSTATUS cli_shadow_copy_data_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, ret = convert_string_talloc( names, CH_UTF16LE, CH_UNIX, src, 2 * sizeof(SHADOW_COPY_LABEL), - &names[i], &converted_size, True); + &names[i], &converted_size); if (!ret) { TALLOC_FREE(names); return NT_STATUS_INVALID_NETWORK_RESPONSE; |