From 15e84a9a09c5a86416e964a3258ee35718fbf45a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 24 Mar 2011 10:59:41 +1100 Subject: 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 Autobuild-Date: Thu Mar 24 01:47:26 CET 2011 on sn-devel-104 --- source3/passdb/pdb_ads.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source3/passdb/pdb_ads.c') diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c index 654bc5de6f..dc728ee454 100644 --- a/source3/passdb/pdb_ads.c +++ b/source3/passdb/pdb_ads.c @@ -388,7 +388,7 @@ static bool pdb_ads_init_ads_from_sam(struct pdb_ads_state *state, ret &= convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF16LE, pw_quote, strlen(pw_quote), - &pw_utf16, &pw_utf16_len, false); + &pw_utf16, &pw_utf16_len); if (!ret) { goto fail; } @@ -1652,8 +1652,7 @@ static bool pdb_ads_dnblob2sid(struct pdb_ads_state *state, DATA_BLOB *dnblob, bool ret; if (!convert_string_talloc(talloc_tos(), CH_UTF8, CH_UNIX, - dnblob->data, dnblob->length, &dn, &len, - false)) { + dnblob->data, dnblob->length, &dn, &len)) { return false; } rc = pdb_ads_search_fmt(state, dn, TLDAP_SCOPE_BASE, -- cgit