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 /source4/torture | |
| 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 'source4/torture')
| -rw-r--r-- | source4/torture/basic/charset.c | 2 | ||||
| -rw-r--r-- | source4/torture/basic/utable.c | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/forest_trust.c | 3 | ||||
| -rw-r--r-- | source4/torture/rpc/samlogon.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/winreg.c | 3 |
5 files changed, 6 insertions, 8 deletions
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c index e09297ecaa..301efabf4f 100644 --- a/source4/torture/basic/charset.c +++ b/source4/torture/basic/charset.c @@ -55,7 +55,7 @@ static NTSTATUS unicode_open(struct torture_context *tctx, } SSVAL(ucs_name, i*2, 0); - if (!convert_string_talloc_convenience(ucs_name, lpcfg_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname, &i, false)) { + if (!convert_string_talloc_convenience(ucs_name, lpcfg_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname, &i)) { torture_comment(tctx, "Failed to convert UCS2 Name into unix - convert_string_talloc() failure\n"); talloc_free(ucs_name); return NT_STATUS_NO_MEMORY; diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c index ffa25650de..eaa3f39e9c 100644 --- a/source4/torture/basic/utable.c +++ b/source4/torture/basic/utable.c @@ -52,7 +52,7 @@ bool torture_utable(struct torture_context *tctx, p = fname+strlen(fname); len = convert_string(CH_UTF16, CH_UNIX, c2, 2, - p, sizeof(fname)-strlen(fname), false); + p, sizeof(fname)-strlen(fname)); p[len] = 0; strncat(fname,"_a_long_extension",sizeof(fname)-1); @@ -111,7 +111,7 @@ static char *form_name(int c) len = convert_string(CH_UTF16, CH_UNIX, c2, 2, - p, sizeof(fname)-strlen(fname), false); + p, sizeof(fname)-strlen(fname)); if (len == -1) return NULL; p[len] = 0; 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, |