summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-03-24 10:59:41 +1100
committerAndrew Tridgell <tridge@samba.org>2011-03-24 01:47:26 +0100
commit15e84a9a09c5a86416e964a3258ee35718fbf45a (patch)
treea3c1d6698668e55b257c96fe2cace1ac7c8edb3a /source4/dsdb/samdb
parent451856698fc04a9426ec9cb1ec039574f82f56bb (diff)
downloadsamba-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/dsdb/samdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/password_hash.c6
-rw-r--r--source4/dsdb/samdb/ldb_modules/samldb.c2
2 files changed, 3 insertions, 5 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");