summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2015-08-17 16:09:35 +1200
committerStefan Metzmacher <metze@samba.org>2015-08-17 22:30:20 +0200
commit3f5cd1fd088e26879843354f1a3eba8041f41129 (patch)
tree5224fe7893982ad8844583e5ea9e44c7875dff99
parentec7f97cb4145d24d2fbc09fa6aff63c5cac6eed4 (diff)
downloadsamba-3f5cd1fd088e26879843354f1a3eba8041f41129.tar.gz
Revert "dsdb: Only parse SAMBA_LDAP_MATCH_RULE_TRANSITIVE_EVAL as a DN"
This reverts commit 1a012d591bca727b5cabacf6455d2009afb16bd7. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10493 Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 8cacd5b8113fa30fb4ccaaf3193839660feb285f)
-rw-r--r--source4/dsdb/samdb/ldb_modules/extended_dn_in.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
index b7ca636598f..41270361e72 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
@@ -35,7 +35,6 @@
#include <ldb_module.h>
#include "dsdb/samdb/samdb.h"
#include "dsdb/samdb/ldb_modules/util.h"
-#include "lib/ldb-samba/ldb_matching_rules.h"
/*
TODO: if relax is not set then we need to reject the fancy RMD_* and
@@ -407,8 +406,7 @@ static int extended_dn_filter_callback(struct ldb_parse_tree *tree, void *privat
if (tree->operation == LDB_OP_EQUALITY) {
dn = ldb_dn_from_ldb_val(filter_ctx, ldb_module_get_ctx(filter_ctx->module), &tree->u.equality.value);
- } else if (tree->operation == LDB_OP_EXTENDED
- && (strcmp(tree->u.extended.rule_id, SAMBA_LDAP_MATCH_RULE_TRANSITIVE_EVAL) == 0)) {
+ } else if (tree->operation == LDB_OP_EXTENDED) {
dn = ldb_dn_from_ldb_val(filter_ctx, ldb_module_get_ctx(filter_ctx->module), &tree->u.extended.value);
}
if (dn == NULL) {