summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-08-05 13:10:22 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-08-09 11:56:23 +0200
commitfd04a38d5063cd5b90970c7a89a1f12701833df7 (patch)
tree3eb3ea3ff5605127a1246bea6045446ede07d333
parent4e4953dd48467cf96a17cc48ccf1139e175845fe (diff)
downloadsamba-fd04a38d5063cd5b90970c7a89a1f12701833df7.tar.gz
samba-fd04a38d5063cd5b90970c7a89a1f12701833df7.tar.bz2
samba-fd04a38d5063cd5b90970c7a89a1f12701833df7.zip
s4-dsdb: make extended_dn_in a bit more efficient
checking filter elements in the right order makes it a little faster
-rw-r--r--source4/dsdb/samdb/ldb_modules/extended_dn_in.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
index 76a951866d..760dd643b4 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
@@ -343,6 +343,11 @@ static int extended_dn_filter_callback(struct ldb_parse_tree *tree, void *privat
filter_ctx = talloc_get_type_abort(private_context, struct extended_dn_filter_ctx);
+ if (filter_ctx->test_only && filter_ctx->matched) {
+ /* the tree already matched */
+ return LDB_SUCCESS;
+ }
+
attribute = dsdb_attribute_by_lDAPDisplayName(filter_ctx->schema, tree->u.equality.attr);
if (attribute == NULL) {
return LDB_SUCCESS;
@@ -366,7 +371,19 @@ static int extended_dn_filter_callback(struct ldb_parse_tree *tree, void *privat
return LDB_SUCCESS;
}
+ guid_val = ldb_dn_get_extended_component(dn, "GUID");
+ sid_val = ldb_dn_get_extended_component(dn, "SID");
+
+ if (!guid_val && !sid_val && (attribute->searchFlags & SEARCH_FLAG_ATTINDEX)) {
+ /* if it is indexed, then fixing the string DN will do
+ no good here, as we will not find the attribute in
+ the index. So for now fall through to a standard DN
+ component comparison */
+ return LDB_SUCCESS;
+ }
+
if (filter_ctx->test_only) {
+ /* we need to copy the tree */
filter_ctx->matched = true;
return LDB_SUCCESS;
}
@@ -378,9 +395,6 @@ static int extended_dn_filter_callback(struct ldb_parse_tree *tree, void *privat
return LDB_SUCCESS;
}
- guid_val = ldb_dn_get_extended_component(dn, "GUID");
- sid_val = ldb_dn_get_extended_component(dn, "SID");
-
if (guid_val) {
expression = talloc_asprintf(filter_ctx, "objectGUID=%s", ldb_binary_encode(filter_ctx, *guid_val));
scope = LDB_SCOPE_SUBTREE;
@@ -389,12 +403,6 @@ static int extended_dn_filter_callback(struct ldb_parse_tree *tree, void *privat
expression = talloc_asprintf(filter_ctx, "objectSID=%s", ldb_binary_encode(filter_ctx, *sid_val));
scope = LDB_SCOPE_SUBTREE;
base_dn = NULL;
- } else if (attribute->searchFlags & SEARCH_FLAG_ATTINDEX) {
- /* if it is indexed, then fixing the string DN will do
- no good here, as we will not find the attribute in
- the index. So for now fall through to a standard DN
- component comparison */
- return LDB_SUCCESS;
} else {
/* fallback to searching using the string DN as the base DN */
expression = "objectClass=*";