ldb: ldb_set_utf8_default() sets comparison function

The default is ASCII only, which is used by SSSD and OpenChange.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/ldb/common/ldb_utf8.c b/lib/ldb/common/ldb_utf8.c
index e81317839cf6e77a5fce8a82135d700706cd6d2c..5b3f3b37d76e6f6cea746949a895952521f20341 100644 (file)
--- a/lib/ldb/common/ldb_utf8.c
+++ b/lib/ldb/common/ldb_utf8.c
@@ -141,7 +141,9 @@ int ldb_comparison_fold_ascii(void *ignored,
 
 void ldb_set_utf8_default(struct ldb_context *ldb)
 {
-       ldb_set_utf8_fns(ldb, NULL, ldb_casefold_default);
+       ldb_set_utf8_functions(ldb, NULL,
+                         ldb_casefold_default,
+                         ldb_comparison_fold_ascii);
 }
 
 char *ldb_casefold(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, const char *s, size_t n)

diff --git a/selftest/knownfail.d/ldb_comparison_fold b/selftest/knownfail.d/ldb_comparison_fold
index eef0803fd843cd8ce0a7ef372f18f3cf51138a11..f5673ab4c0153b9695c920c27770da9f6d1856d3 100644 (file)
--- a/selftest/knownfail.d/ldb_comparison_fold
+++ b/selftest/knownfail.d/ldb_comparison_fold
@@ -1,4 +1 @@
-^ldb.unittests.test_ldb_comparison_fold.test_ldb_comparison_fold_default_common
-^ldb.unittests.test_ldb_comparison_fold.test_ldb_comparison_fold_default_ascii
-^ldb.unittests.test_ldb_comparison_fold.test_ldb_comparison_fold_utf8_common
 ^ldb.unittests.test_ldb_comparison_fold.test_ldb_comparison_fold_utf8\b