CVS tag updates

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

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index d14ca8d12e5a97730a2d6ee7d156ffeaf6737ef5..225f81330512dbe6630f639e9f0f585c267665cb 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -1,9 +1,8 @@
 # master slapd config -- for testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-acl.conf,v 1.46.2.4 2003/12/15 22:05:29
-  kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2008 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -27,7 +26,7 @@ argsfile      @TESTDIR@/slapd.1.args
 # normal installations should protect root dse, cn=monitor, cn=subschema
 #
 
-access         to dn.exact="" attr=objectClass
+access         to dn.exact="" attrs=objectClass
                by users read
 access         to *
                by * read
@@ -42,7 +41,7 @@ access                to *
 #######################################################################
 
 database       @BACKEND@
-#ldbm#cachesize        0
+
 suffix         "dc=example,dc=com"
 directory      @TESTDIR@/db.1.a
 rootdn         "cn=Manager,dc=example,dc=com"
@@ -51,15 +50,13 @@ rootpw              secret
 #bdb#index             cn,sn,uid       pres,eq,sub
 #hdb#index             objectClass     eq
 #hdb#index             cn,sn,uid       pres,eq,sub
-#ldbm#index            objectClass     eq
-#ldbm#index            cn,sn,uid       pres,eq,sub
 
-#access                to attr=objectclass dn.subtree="dc=example,dc=com"
-access         to attr=objectclass
+#access                to attrs=objectclass dn.subtree="dc=example,dc=com"
+access         to attrs=objectclass
                by * =rsc stop
 
-#access                to filter="(objectclass=person)" attr=userpassword dn.subtree="dc=example,dc=com"
-access         to filter="(objectclass=person)" attr=userpassword
+#access                to filter="(objectclass=person)" attrs=userpassword dn.subtree="dc=example,dc=com"
+access         to filter="(objectclass=person)" attrs=userpassword
                by anonymous auth
                by self =wx
 
@@ -108,14 +105,15 @@ access            to dn.children="ou=Alumni Association,ou=People,dc=example,dc=com"
                by dn.children="dc=example,dc=com" +d continue
                by * stop
 
-#access                to attr=member,uniquemember dn.subtree="dc=example,dc=com"
-access         to attr=member,uniquemember
+#access                to attrs=member,uniquemember dn.subtree="dc=example,dc=com"
+access         to attrs=member,uniquemember
+               by dn.exact="cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com" selfwrite
                by dnattr=member selfwrite
                by dnattr=uniquemember selfwrite
                by * read
 
-#access                to attr=member,uniquemember filter="(mail=*com)" dn.subtree="dc=example,dc=com"
-access         to attr=member,uniquemember filter="(mail=*com)"
+#access                to attrs=member,uniquemember filter="(mail=*com)" dn.subtree="dc=example,dc=com"
+access         to attrs=member,uniquemember filter="(mail=*com)"
                by * read
 
 #access                to filter="(|(objectclass=groupofnames)(objectClass=groupofuniquenames))" dn.subtree="dc=example,dc=com"