X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fdata%2Fslapd-idassert.conf;h=5e8785b605501106e8082a45bc9b12dd7f056e2d;hb=c6b5abbfd20567116846ebc38f0005c429284c98;hp=065d6c10d0299e46f6daa41f72e081b154a07571;hpb=0602be7c8ecd556d88acde99fb451ea58cd8ef3d;p=openldap
diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf
index 065d6c10d0..5e8785b605 100644
--- a/tests/data/slapd-idassert.conf
+++ b/tests/data/slapd-idassert.conf
@@ -1,9 +1,8 @@
# master slapd config -- for testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-pw.conf,v 1.19.2.4 2003/12/15 22:05:29
- kurt Exp $
+# $OpenLDAP$
## This work is part of OpenLDAP Software .
##
-## Copyright 1998-2003 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
@@ -15,13 +14,13 @@
## .
#ucdata-path ./ucdata
-include ./schema/core.schema
-include ./schema/cosine.schema
-include ./schema/inetorgperson.schema
-include ./schema/openldap.schema
-include ./schema/nis.schema
-pidfile ./testrun/slapd.1.pid
-argsfile ./testrun/slapd.1.args
+include @SCHEMADIR@/core.schema
+include @SCHEMADIR@/cosine.schema
+include @SCHEMADIR@/inetorgperson.schema
+include @SCHEMADIR@/openldap.schema
+include @SCHEMADIR@/nis.schema
+pidfile @TESTDIR@/slapd.1.pid
+argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
@@ -39,14 +38,14 @@ 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,
# cn=monitor, cn=schema, and cn=config
#
-access to attr=userpassword
+access to attrs=userpassword
by self =wx
by anonymous =x
@@ -58,43 +57,45 @@ access to *
by * search
database @BACKEND@
-#ldbm#cachesize 0
+
suffix "dc=example,dc=com"
-directory ./testrun/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
-index objectClass eq
-index cn,sn,uid pres,eq,sub
+#null#bind on
+#~null~#directory @TESTDIR@/db.1.a
+#indexdb#index objectClass eq
+#indexdb#index cn,sn,uid pres,eq,sub
+#ndb#dbname db_1
+#ndb#include @DATADIR@/ndb.conf
access to dn.exact="cn=Proxy,ou=Admin,dc=example,dc=com"
- attr=authzTo
+ attrs=authzTo
by dn.exact="cn=Proxy,ou=Admin,dc=example,dc=com" =wx
by * =x
database @BACKEND@
-#ldbm#cachesize 0
+
suffix "dc=example,dc=it"
-directory ./testrun/db.2.a
rootdn "cn=Manager,dc=example,dc=it"
rootpw secret
-index objectClass eq
-index cn,sn,uid pres,eq,sub
+#~null~#directory @TESTDIR@/db.2.a
+#indexdb#index objectClass eq
+#indexdb#index cn,sn,uid pres,eq,sub
+#ndb#dbname db_2
+#ndb#include @DATADIR@/ndb.conf
database ldap
suffix "o=Example,c=US"
uri "@URI1@"
-#sasl#idassert-method "sasl" "authcDN=cn=Proxy US,ou=Admin,dc=example,dc=com" "authcID=admin/proxy US" "cred=proxy" @SASL_MECH@
-#nosasl#idassert-method "simple"
-#nosasl#idassert-authcDN "cn=Proxy US,ou=Admin,dc=example,dc=com"
-#nosasl#idassert-passwd proxy
-idassert-mode self
+#sasl#idassert-bind bindmethod=sasl binddn="cn=Proxy US,ou=Admin,dc=example,dc=com" authcId="admin/proxy US" credentials="proxy" @SASL_MECH@ mode=self
+#nosasl#idassert-bind bindmethod=simple binddn="cn=Proxy US,ou=Admin,dc=example,dc=com" credentials="proxy" mode=self
# authorizes database
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"
@@ -103,10 +104,7 @@ uri "@URI1@"
acl-authcDN "cn=Proxy IT,ou=Admin,dc=example,dc=com"
acl-passwd proxy
-idassert-method "simple"
-idassert-authcDN "cn=Proxy IT,ou=Admin,dc=example,dc=com"
-idassert-passwd proxy
-idassert-mode "dn:cn=Sandbox,ou=Admin,dc=example,dc=com"
+idassert-bind bindmethod=simple binddn="cn=Proxy IT,ou=Admin,dc=example,dc=com" credentials="proxy" authzId="dn:cn=Sandbox,ou=Admin,dc=example,dc=com"
# authorizes database
idassert-authzFrom "dn.subtree:dc=example,dc=com"
@@ -114,7 +112,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
@@ -125,4 +123,6 @@ access to *
by dn.exact="cn=Sandbox,ou=Admin,dc=example,dc=com" search
by * none
-#monitor#database monitor
+#monitor#database monitor
+#monitor#rootdn "cn=monitor"
+#monitor#rootpw monitor