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 /libcli | |
| 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 'libcli')
| -rw-r--r-- | libcli/auth/msrpc_parse.c | 4 | ||||
| -rw-r--r-- | libcli/auth/ntlm_check.c | 2 | ||||
| -rw-r--r-- | libcli/auth/smbencrypt.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c index 7ac6fb57b2..1351dfaae7 100644 --- a/libcli/auth/msrpc_parse.c +++ b/libcli/auth/msrpc_parse.c @@ -264,7 +264,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, size_t pull_len; if (!convert_string_talloc(mem_ctx, CH_UTF16, CH_UNIX, blob->data + ptr, len1, - ps, &pull_len, false)) { + ps, &pull_len)) { ret = false; goto cleanup; } @@ -300,7 +300,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx, if (!convert_string_talloc(mem_ctx, CH_DOS, CH_UNIX, blob->data + ptr, len1, - ps, &pull_len, false)) { + ps, &pull_len)) { ret = false; goto cleanup; } diff --git a/libcli/auth/ntlm_check.c b/libcli/auth/ntlm_check.c index da16ce2fb0..9cbd49595f 100644 --- a/libcli/auth/ntlm_check.c +++ b/libcli/auth/ntlm_check.c @@ -322,7 +322,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx, if (lm_response->length && (convert_string_talloc(mem_ctx, CH_DOS, CH_UNIX, lm_response->data, lm_response->length, - (void *)&unix_pw, NULL, false))) { + (void *)&unix_pw, NULL))) { if (E_deshash(unix_pw, client_lm.hash)) { lm_ok = true; } else { diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c index f7c60e7de1..3274f113c2 100644 --- a/libcli/auth/smbencrypt.c +++ b/libcli/auth/smbencrypt.c @@ -596,8 +596,7 @@ bool decode_pw_buffer(TALLOC_CTX *ctx, &in_buffer[512 - byte_len], byte_len, (void *)pp_new_pwrd, - new_pw_len, - false)) { + new_pw_len)) { DEBUG(0, ("decode_pw_buffer: failed to convert incoming password\n")); return false; } |