charcnv: removed the allow_badcharcnv and allow_bad_conv options to convert_string*()

[kai/samba.git] / source4 / smb_server / smb / request.c

diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c
index 65ed3d0af3a6336c1b0120ed172e9a796cfb679f..59a34a0b136c91bc0af49c8a464056b88ea17015 100644 (file)
--- a/source4/smb_server/smb/request.c
+++ b/source4/smb_server/smb/request.c
@@ -512,7 +512,7 @@ static size_t req_pull_ucs2(struct request_bufinfo *bufinfo, const char **dest,
                return src_len2 + alignment;
        }
 
-       ret = convert_string_talloc(bufinfo->mem_ctx, CH_UTF16, CH_UNIX, src, src_len2, (void **)&dest2, NULL, false);
+       ret = convert_string_talloc(bufinfo->mem_ctx, CH_UTF16, CH_UNIX, src, src_len2, (void **)&dest2, NULL);
 
        if (!ret) {
                *dest = NULL;
@@ -561,7 +561,7 @@ static size_t req_pull_ascii(struct request_bufinfo *bufinfo, const char **dest,
                src_len2++;
        }
 
-       ret = convert_string_talloc(bufinfo->mem_ctx, CH_DOS, CH_UNIX, src, src_len2, (void **)&dest2, NULL, false);
+       ret = convert_string_talloc(bufinfo->mem_ctx, CH_DOS, CH_UNIX, src, src_len2, (void **)&dest2, NULL);
 
        if (!ret) {
                *dest = NULL;