more about ITS#7525

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index ef249f4b7af1dce6b35297b43b88116826309a5f..231c583c93fbaf9d3cdc1a87483e35d54f9051df 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -319,7 +319,7 @@ static ConfigTable metacfg[] = {
                NULL, NULL },
 
        { "subtree-exclude", "pattern", 2, 2, 0,
-               ARG_QUOTE|ARG_MAGIC|LDAP_BACK_CFG_SUBTREE_EX,
+               ARG_MAGIC|LDAP_BACK_CFG_SUBTREE_EX,
                meta_back_cf_gen, "( OLcfgDbAt:3.103 "
                        "NAME 'olcDbSubtreeExclude' "
                        "DESC 'DN of subtree to exclude from target' "
@@ -327,7 +327,7 @@ static ConfigTable metacfg[] = {
                        "SYNTAX OMsDirectoryString )",
                NULL, NULL },
        { "subtree-include", "pattern", 2, 2, 0,
-               ARG_QUOTE|ARG_MAGIC|LDAP_BACK_CFG_SUBTREE_IN,
+               ARG_MAGIC|LDAP_BACK_CFG_SUBTREE_IN,
                meta_back_cf_gen, "( OLcfgDbAt:3.104 "
                        "NAME 'olcDbSubtreeInclude' "
                        "DESC 'DN of subtree to include in target' "

diff --git a/tests/data/slapd-meta.conf b/tests/data/slapd-meta.conf
index b93a3124dfb661e3ac04c88ec25ed86ba540d1f7..9d5acaf99a2cd682b462aa090726445970e9aa5e 100644 (file)
--- a/tests/data/slapd-meta.conf
+++ b/tests/data/slapd-meta.conf
@@ -50,6 +50,7 @@ bind-timeout  1000000
 
 # local
 uri            "@URI2@ou=Meta,o=Example,c=US"
+subtree-exclude "ou=Excluded,ou=Meta,o=Example,c=US"
 suffixmassage  "ou=Meta,o=Example,c=US" "ou=Meta,dc=example,dc=com"
 ###pseudorootdn        "cn=manager,ou=meta,dc=example,dc=com"
 ###pseudorootpw        secret
@@ -62,6 +63,7 @@ idassert-authzFrom    "dn.exact:cn=Manager,o=Local"
 
 # remote
 uri            "@URI1@o=Example,c=US"
+subtree-include "dn.subtree:o=Example,c=US"
 suffixmassage  "o=Example,c=US" "dc=example,dc=com"
 ###pseudorootdn        "cn=manager,dc=example,dc=com"
 ###pseudorootpw        secret