From d6b82ec6d08aad25cee17fccef0d9f6f153e4d38 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Fri, 1 Mar 2013 10:19:33 +0100 Subject: [PATCH] more about ITS#7525 --- servers/slapd/back-meta/config.c | 4 ++-- tests/data/slapd-meta.conf | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c index ef249f4b7a..231c583c93 100644 --- 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 b93a3124df..9d5acaf99a 100644 --- 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 -- 2.39.5