From 3d75111fd61d57d2a2fb9e19bf587effb0816339 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 13 Oct 2010 20:02:18 +1100 Subject: s4-ldb: added an optional operator_fn in the schema syntax this function takes the operator being invoked, which will allow schema functions to provide more fine grained control over comparisons. The key bug this was introduced to fix is the incorrect handling of the LDB_OP_PRESENT test for deleted linked attributes. The backends are unaware of the deleted state of these links, so they cannot do a LDB_OP_PRESENT test on their own. Pair-Programmed-With: Andrew Bartlett --- source4/lib/ldb/modules/rdn_name.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'source4/lib/ldb/modules/rdn_name.c') diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c index 5dc122f254..a0867c0f51 100644 --- a/source4/lib/ldb/modules/rdn_name.c +++ b/source4/lib/ldb/modules/rdn_name.c @@ -147,9 +147,16 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req) } /* normalise attribute value */ for (i = 0; i < attribute->num_values; i++) { - ret = a->syntax->comparison_fn(ldb, msg, - &rdn_val, &attribute->values[i]); - if (ret == 0) { + bool matched; + if (a->syntax->operator_fn) { + ret = a->syntax->operator_fn(ldb, LDB_OP_EQUALITY, a, + &rdn_val, &attribute->values[i], &matched); + if (ret != LDB_SUCCESS) return ret; + } else { + matched = (a->syntax->comparison_fn(ldb, msg, + &rdn_val, &attribute->values[i]) == 0); + } + if (matched) { /* overwrite so it matches in case */ attribute->values[i] = rdn_val; break; -- cgit