cleanup

[openldap] / tests / data / slapd-idassert.conf

diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf
index 8264d90c65164aab5b1624250e90bbd1859257a4..065d6c10d0299e46f6daa41f72e081b154a07571 100644 (file)
--- a/tests/data/slapd-idassert.conf
+++ b/tests/data/slapd-idassert.conf
@@ -29,15 +29,17 @@ argsfile    ./testrun/slapd.1.args
 #ldapmod#moduleload back_ldap.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
+#rwmmod#modulepath ../servers/slapd/overlays/
+#rwmmod#moduleload rwm.la
 
 #######################################################################
 # database definitions
 #######################################################################
 
 authz-policy   both
-authz-regexp   "^uid=admin/([^,]+),.*" "ldap:///ou=Admin,dc=example,dc=com??sub?cn=$1"
-authz-regexp   "^uid=it/([^,]+),.*" "ldap:///ou=People,dc=example,dc=it??sub?uid=$1"
-authz-regexp   "^uid=(us/)*([^,]+),.*" "ldap:///ou=People,dc=example,dc=com??sub?uid=$2"
+authz-regexp   "^uid=admin/([^,]+),.+" "ldap:///ou=Admin,dc=example,dc=com??sub?(cn=$1)"
+authz-regexp   "^uid=it/([^,]+),.+" "ldap:///ou=People,dc=example,dc=it??sub?(uid=$1)"
+authz-regexp   "^uid=(us/)*([^,]+),.+" "ldap:///ou=People,dc=example,dc=com??sub?(uid=$2)"
 
 #
 # normal installations should protect root dse,
@@ -80,7 +82,6 @@ index         cn,sn,uid       pres,eq,sub
 
 database       ldap
 suffix         "o=Example,c=US"
-suffixmassage  "o=Example,c=US" "dc=example,dc=com"
 uri            "@URI1@"
 
 #sasl#idassert-method "sasl" "authcDN=cn=Proxy US,ou=Admin,dc=example,dc=com" "authcID=admin/proxy US" "cred=proxy" @SASL_MECH@
@@ -92,9 +93,11 @@ idassert-mode        self
 # authorizes database
 idassert-authzFrom     "dn.subtree:dc=example,dc=it"
 
+overlay                rwm
+suffixmassage  "dc=example,dc=com"
+
 database       ldap
 suffix         "o=Esempio,c=IT"
-suffixmassage  "o=Esempio,c=IT" "dc=example,dc=com"
 uri            "@URI1@"
 
 acl-authcDN    "cn=Proxy IT,ou=Admin,dc=example,dc=com"
@@ -110,6 +113,9 @@ idassert-authzFrom  "dn.subtree:dc=example,dc=com"
 # authorizes anonymous
 idassert-authzFrom     "dn.exact:"
 
+overlay                rwm
+suffixmassage  "dc=example,dc=com"
+
 access to attrs=entry,cn,sn,mail
        by users read