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 /lib/tdr | |
| 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 'lib/tdr')
| -rw-r--r-- | lib/tdr/tdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tdr/tdr.c b/lib/tdr/tdr.c index ab016d0bc4..8ce238bf8b 100644 --- a/lib/tdr/tdr.c +++ b/lib/tdr/tdr.c @@ -163,7 +163,7 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, TDR_PULL_NEED_BYTES(tdr, el_size*length); - if (!convert_string_talloc(ctx, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret, false)) { + if (!convert_string_talloc(ctx, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret)) { return NT_STATUS_INVALID_PARAMETER; } @@ -183,7 +183,7 @@ NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, required = el_size * length; TDR_PUSH_NEED_BYTES(tdr, required); - ret = convert_string(CH_UNIX, chset, *v, strlen(*v), tdr->data.data+tdr->data.length, required, false); + ret = convert_string(CH_UNIX, chset, *v, strlen(*v), tdr->data.data+tdr->data.length, required); if (ret == -1) { return NT_STATUS_INVALID_PARAMETER; } |