From 15e84a9a09c5a86416e964a3258ee35718fbf45a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 24 Mar 2011 10:59:41 +1100 Subject: 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 Autobuild-Date: Thu Mar 24 01:47:26 CET 2011 on sn-devel-104 --- source4/torture/rpc/forest_trust.c | 3 +-- source4/torture/rpc/samlogon.c | 2 +- source4/torture/rpc/winreg.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'source4/torture/rpc') diff --git a/source4/torture/rpc/forest_trust.c b/source4/torture/rpc/forest_trust.c index 3ef3f1d819..060ac43910 100644 --- a/source4/torture/rpc/forest_trust.c +++ b/source4/torture/rpc/forest_trust.c @@ -436,8 +436,7 @@ static bool get_trust_domain_passwords_auth_blob(TALLOC_CTX *mem_ctx, if (!convert_string_talloc(mem_ctx, CH_UNIX, CH_UTF16, password, strlen(password), &auth_info_array[0].AuthInfo.clear.password, - &converted_size, - false)) { + &converted_size)) { return false; } diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index 0ba0d2633f..e624f000f6 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -1192,7 +1192,7 @@ static bool test_plaintext(struct samlogon_state *samlogon_state, enum ntlm_brea if (!convert_string_talloc(samlogon_state->mem_ctx, CH_UNIX, CH_DOS, password, strlen(password)+1, - (void**)&dospw, NULL, false)) { + (void**)&dospw, NULL)) { DEBUG(0, ("convert_string_talloc failed!\n")); exit(1); } diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c index 8a9a5e48bc..55164cdadf 100644 --- a/source4/torture/rpc/winreg.c +++ b/source4/torture/rpc/winreg.c @@ -2771,8 +2771,7 @@ static bool test_symlink_keys(struct torture_context *tctx, convert_string_talloc(tctx, CH_UNIX, CH_UTF16, kernel_mode_path, strlen(kernel_mode_path), /* not NULL terminated */ - &blob.data, &blob.length, - false), + &blob.data, &blob.length), "failed to convert"); torture_assert(tctx, -- cgit