Merge remote-tracking branch 'origin/mdb.master'

[openldap] / tests / data / slapd-glue-ldap.conf

diff --git a/tests/data/slapd-glue-ldap.conf b/tests/data/slapd-glue-ldap.conf
index ba5222096a99760ab1f64c5304a1e211d5baf34c..62784907118222c372aa6806779d4150d36f168a 100644 (file)
--- a/tests/data/slapd-glue-ldap.conf
+++ b/tests/data/slapd-glue-ldap.conf
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2006 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -52,9 +52,9 @@ chase-referrals       no
 idassert-bind  bindmethod=simple
                binddn="cn=Manager,ou=Meta,dc=example,dc=com"
                credentials="secret"
-               mode=none
+               mode=self
                flags=non-prescriptive
-idassert-authzfrom     "dn.exact:cn=Manager,dc=example,dc=com"
+idassert-authzfrom     "dn.exact:cn=Manager,o=Local"
 
 # local
 database       ldap
@@ -66,10 +66,17 @@ chase-referrals     no
 idassert-bind  bindmethod=simple
                binddn="cn=Manager,dc=example,dc=com"
                credentials="secret"
-               mode=none
+               mode=self
                flags=non-prescriptive
-idassert-authzfrom     "dn.exact:cn=Manager,dc=example,dc=com"
+idassert-authzfrom     "dn.exact:cn=Manager,o=Local"
 
 limits         dn.exact="cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com" time=1 size=8
 
+# This is only for binding as the rootdn
+database       ldap
+suffix         "o=Local"
+rootdn         "cn=Manager,o=Local"
+rootpw         secret
+uri            "@URI6@"
+
 #monitor#database      monitor