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

3 files changed, 8 insertions, 10 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 53d12d96df..470a2b05a3 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1689,8 +1689,7 @@ static int setup_given_passwords(struct setup_password_fields_io *io,
 					   g->cleartext_utf8->data,
 					   g->cleartext_utf8->length,
 					   (void *)&cleartext_utf16_blob->data,
-					   &cleartext_utf16_blob->length,
-					   false)) {
+					   &cleartext_utf16_blob->length)) {
 			if (g->cleartext_utf8->length != 0) {
 				talloc_free(cleartext_utf16_blob);
 				ldb_asprintf_errstring(ldb,
@@ -1717,8 +1716,7 @@ static int setup_given_passwords(struct setup_password_fields_io *io,
 					   g->cleartext_utf16->data,
 					   g->cleartext_utf16->length,
 					   (void *)&cleartext_utf8_blob->data,
-					   &cleartext_utf8_blob->length,
-					   false)) {
+					   &cleartext_utf8_blob->length)) {
 			if (g->cleartext_utf16->length != 0) {
 				/* We must bail out here, the input wasn't even
 				 * a multiple of 2 bytes */
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index f59aae8969..21341850d9 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -335,7 +335,7 @@ found:
 				   CH_UNIX, CH_UTF16,
 				   newpass, strlen(newpass),
 				   (void *)&newpass_utf16.data,
-				   &newpass_utf16.length, false)) {
+				   &newpass_utf16.length)) {
 		ldb_asprintf_errstring(ldb,
 				       "samldb_rodc_add: "
 				       "failed to generate UTF16 password from random password");
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index 6d2700599d..88badc7136 100644
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -1484,7 +1484,7 @@ static WERROR dsdb_syntax_UNICODE_drsuapi_to_ldb(const struct dsdb_syntax_ctx *c
 					   CH_UTF16, CH_UNIX,
 					   in->value_ctr.values[i].blob->data,
 					   in->value_ctr.values[i].blob->length,
-					   (void **)&str, NULL, false)) {
+					   (void **)&str, NULL)) {
 			return WERR_FOOBAR;
 		}
 
@@ -1524,7 +1524,7 @@ static WERROR dsdb_syntax_UNICODE_ldb_to_drsuapi(const struct dsdb_syntax_ctx *c
 		if (!convert_string_talloc(blobs,
 					   CH_UNIX, CH_UTF16,
 					   in->values[i].data, in->values[i].length,
-					   (void **)&blobs[i].data, &blobs[i].length, false)) {
+					   (void **)&blobs[i].data, &blobs[i].length)) {
 			return WERR_FOOBAR;
 		}
 	}
@@ -1549,7 +1549,7 @@ static WERROR dsdb_syntax_UNICODE_validate_one_val(const struct dsdb_syntax_ctx
 				   val->data,
 				   val->length,
 				   (void **)&dst,
-				   &size, false);
+				   &size);
 	TALLOC_FREE(dst);
 	if (!ok) {
 		return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
@@ -2246,7 +2246,7 @@ static WERROR dsdb_syntax_PRESENTATION_ADDRESS_drsuapi_to_ldb(const struct dsdb_
 		if (!convert_string_talloc(out->values, CH_UTF16, CH_UNIX,
 					   in->value_ctr.values[i].blob->data+4,
 					   in->value_ctr.values[i].blob->length-4,
-					   (void **)&str, NULL, false)) {
+					   (void **)&str, NULL)) {
 			return WERR_FOOBAR;
 		}
 
@@ -2289,7 +2289,7 @@ static WERROR dsdb_syntax_PRESENTATION_ADDRESS_ldb_to_drsuapi(const struct dsdb_
 		if (!convert_string_talloc(blobs, CH_UNIX, CH_UTF16,
 					   in->values[i].data,
 					   in->values[i].length,
-					   (void **)&data, &ret, false)) {
+					   (void **)&data, &ret)) {
 			return WERR_FOOBAR;
 		}