From 6005c8cbad77259fa3cb89ab21cb5f26b72413cd Mon Sep 17 00:00:00 2001 From: Aaron Haslett Date: Tue, 28 May 2019 13:00:43 +1200 Subject: [PATCH] ldb: only used a->syntax->index_format_fn if GUID indexing is enabled Only enable ORDERED_INTEGER and index_format_fn functionality if GUID indexing is enabled. This is in line with the rest of ldb_kv which binds the new ORDERED_INTEGER to GUID indexed databases, and allows a practical way to create the old index format (by disabling the GUID index). Signed-off-by: Aaron Haslett Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam Pair-Programmed-With: Andrew Bartlett --- lib/ldb/ldb_key_value/ldb_kv_index.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ldb/ldb_key_value/ldb_kv_index.c b/lib/ldb/ldb_key_value/ldb_kv_index.c index f6b2620a8751..fff00918a126 100644 --- a/lib/ldb/ldb_key_value/ldb_kv_index.c +++ b/lib/ldb/ldb_key_value/ldb_kv_index.c @@ -924,7 +924,8 @@ static struct ldb_dn *ldb_kv_index_key(struct ldb_context *ldb, v = *value; } else { ldb_attr_handler_t fn; - if (a->syntax->index_format_fn) { + if (a->syntax->index_format_fn && + ldb_kv->cache->GUID_index_attribute != NULL) { fn = a->syntax->index_format_fn; } else { fn = a->syntax->canonicalise_fn; -- 2.34.1