summaryrefslogtreecommitdiffstats
path: root/ldap/servers/slapd/mapping_tree.c
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2009-03-07 00:59:07 +0000
committerRich Megginson <rmeggins@redhat.com>2009-03-07 00:59:07 +0000
commit38b7743d68154b040d79b023a2e354a0a725a648 (patch)
treed2239b519fd9126a3c5f6f97b2453cb773ffe5a1 /ldap/servers/slapd/mapping_tree.c
parent2a355b73670780a972a70bcd40366ace157e1658 (diff)
downloadds-38b7743d68154b040d79b023a2e354a0a725a648.tar.gz
ds-38b7743d68154b040d79b023a2e354a0a725a648.tar.xz
ds-38b7743d68154b040d79b023a2e354a0a725a648.zip
Resolves: bug 488814
Description: mapping tree code inconsistent about treatment of quoted node names Reviewed by: nhosoi (Thanks!) Fix Description: Look for (|(%s=\"%s\")(%s=%s))) when looking for mapping tree suffixes - there may be a quoted suffix, or one without quotes, so look for either
Diffstat (limited to 'ldap/servers/slapd/mapping_tree.c')
-rw-r--r--ldap/servers/slapd/mapping_tree.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ldap/servers/slapd/mapping_tree.c b/ldap/servers/slapd/mapping_tree.c
index a0b0d9c6..c682597a 100644
--- a/ldap/servers/slapd/mapping_tree.c
+++ b/ldap/servers/slapd/mapping_tree.c
@@ -910,7 +910,9 @@ mapping_tree_node_get_children(mapping_tree_node *target, int is_root)
filter = slapi_ch_smprintf("(&(objectclass=nsMappingTree)(!(%s=*)))",
MAPPING_TREE_PARENT_ATTRIBUTE);
} else {
- filter = slapi_ch_smprintf("(&(objectclass=nsMappingTree)(%s=\"%s\"))",
+ filter = slapi_ch_smprintf("(&(objectclass=nsMappingTree)(|(%s=\"%s\")(%s=%s)))",
+ MAPPING_TREE_PARENT_ATTRIBUTE,
+ slapi_sdn_get_dn(target->mtn_subtree),
MAPPING_TREE_PARENT_ATTRIBUTE,
slapi_sdn_get_dn(target->mtn_subtree));
}