Define SLAP_USE_CONFDIR, fix moduleload

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

diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf
index 065d6c10d0299e46f6daa41f72e081b154a07571..648ac31320dd738c330998724b9fbdd54ff8f9aa 100644 (file)
--- a/tests/data/slapd-idassert.conf
+++ b/tests/data/slapd-idassert.conf
@@ -3,7 +3,7 @@
  kurt Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2003 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@ argsfile    ./testrun/slapd.1.args
 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=(us/)?([^,]+),.+" "ldap:///ou=People,dc=example,dc=com??sub?(uid=$2)"
 
 #
 # normal installations should protect root dse,
@@ -94,7 +94,7 @@ idassert-mode self
 idassert-authzFrom     "dn.subtree:dc=example,dc=it"
 
 overlay                rwm
-suffixmassage  "dc=example,dc=com"
+rwm-suffixmassage      "dc=example,dc=com"
 
 database       ldap
 suffix         "o=Esempio,c=IT"
@@ -114,7 +114,7 @@ idassert-authzFrom  "dn.subtree:dc=example,dc=com"
 idassert-authzFrom     "dn.exact:"
 
 overlay                rwm
-suffixmassage  "dc=example,dc=com"
+rwm-suffixmassage      "dc=example,dc=com"
 
 access to attrs=entry,cn,sn,mail
        by users read