diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 06:33:40 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 06:33:40 +0100 |
| commit | 9ffb6d2d9e78ed192b8215194b6328d03d1ddad3 (patch) | |
| tree | fc76fb3e1d8d9e381559244440c6738574f6c21d /source4/torture/basic | |
| parent | 79fc0ddaf44af1e31d7e6f2c6f576fd3c05e087d (diff) | |
| download | samba-9ffb6d2d9e78ed192b8215194b6328d03d1ddad3.tar.gz samba-9ffb6d2d9e78ed192b8215194b6328d03d1ddad3.tar.bz2 samba-9ffb6d2d9e78ed192b8215194b6328d03d1ddad3.zip | |
Add allow_badcharcnv argument to all conversion function, for
consistency with Samba 3.
Diffstat (limited to 'source4/torture/basic')
| -rw-r--r-- | source4/torture/basic/charset.c | 2 | ||||
| -rw-r--r-- | source4/torture/basic/utable.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c index 0ae7f6036b..33ab2c9768 100644 --- a/source4/torture/basic/charset.c +++ b/source4/torture/basic/charset.c @@ -56,7 +56,7 @@ static NTSTATUS unicode_open(struct torture_context *tctx, } SSVAL(ucs_name, i*2, 0); - i = convert_string_talloc_convenience(ucs_name, lp_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname); + i = convert_string_talloc_convenience(ucs_name, lp_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname, false); if (i == -1) { torture_comment(tctx, "Failed to convert UCS2 Name into unix - convert_string_talloc() failure\n"); talloc_free(ucs_name); diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c index f0700f73a0..ef0e4d44ed 100644 --- a/source4/torture/basic/utable.c +++ b/source4/torture/basic/utable.c @@ -51,7 +51,7 @@ bool torture_utable(struct torture_context *tctx, p = fname+strlen(fname); len = convert_string_convenience(lp_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, c2, 2, - p, sizeof(fname)-strlen(fname)); + p, sizeof(fname)-strlen(fname), false); p[len] = 0; strncat(fname,"_a_long_extension",sizeof(fname)-1); @@ -110,7 +110,7 @@ static char *form_name(struct smb_iconv_convenience *iconv_convenience, int c) len = convert_string_convenience(iconv_convenience, CH_UTF16, CH_UNIX, c2, 2, - p, sizeof(fname)-strlen(fname)); + p, sizeof(fname)-strlen(fname), false); p[len] = 0; return fname; } |