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

6 files changed, 6 insertions, 6 deletions

diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index f0a4e34207..f93deab9db 100644
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -633,7 +633,7 @@ static bool is_legal_name(const char *name)
 			 * for mb UNIX asian characters like Japanese (SJIS) here.
 			 * JRA.
 			 */
-			if (convert_string(CH_UNIX, CH_UTF16LE, name, 2, mbc, 2, False) == 2) {
+			if (convert_string(CH_UNIX, CH_UTF16LE, name, 2, mbc, 2) == 2) {
 				/* Was a good mb string. */
 				name += 2;
 				continue;
diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index 386aca1727..f2ca420bf9 100644
--- a/source3/smbd/message.c
+++ b/source3/smbd/message.c
@@ -73,7 +73,7 @@ static void msg_deliver(struct msg_state *state)
 
 	if (!convert_string_talloc(talloc_tos(), CH_DOS, CH_UNIX, state->msg,
 				   talloc_get_size(state->msg), (void *)&msg,
-				   &len, true)) {
+				   &len)) {
 		DEBUG(3, ("Conversion failed, delivering message in DOS "
 			  "codepage format\n"));
 		msg = state->msg;
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index b191b74fcc..70f0dba404 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -212,7 +212,7 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
 				   in_name_buffer.data,
 				   in_name_buffer.length,
 				   &in_name_string,
-				   &in_name_string_size, false);
+				   &in_name_string_size);
 	if (!ok) {
 		return smbd_smb2_request_error(smb2req, NT_STATUS_ILLEGAL_CHARACTER);
 	}
diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c
index 1ee493b906..fe5dee618e 100644
--- a/source3/smbd/smb2_find.c
+++ b/source3/smbd/smb2_find.c
@@ -107,7 +107,7 @@ NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req)
 				   in_file_name_buffer.data,
 				   in_file_name_buffer.length,
 				   &in_file_name_string,
-				   &in_file_name_string_size, false);
+				   &in_file_name_string_size);
 	if (!ok) {
 		return smbd_smb2_request_error(req, NT_STATUS_ILLEGAL_CHARACTER);
 	}
diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c
index 672965f470..5a42d59e9a 100644
--- a/source3/smbd/smb2_ioctl.c
+++ b/source3/smbd/smb2_ioctl.c
@@ -303,7 +303,7 @@ static struct tevent_req *smbd_smb2_ioctl_send(TALLOC_CTX *mem_ctx,
 					   in_file_name_buffer.data,
 					   in_file_name_buffer.length,
 					   &in_file_name_string,
-					   &in_file_name_string_size, false);
+					   &in_file_name_string_size);
 		if (!ok) {
 			tevent_req_nterror(req, NT_STATUS_ILLEGAL_CHARACTER);
 			return tevent_req_post(req, ev);
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index 01c7e01c65..39b8eb1ae7 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -81,7 +81,7 @@ NTSTATUS smbd_smb2_request_process_tcon(struct smbd_smb2_request *req)
 				   in_path_buffer.data,
 				   in_path_buffer.length,
 				   &in_path_string,
-				   &in_path_string_size, false);
+				   &in_path_string_size);
 	if (!ok) {
 		return smbd_smb2_request_error(req, NT_STATUS_ILLEGAL_CHARACTER);
 	}