Misc. updates from HEAD, rm ext matching

diff --git a/CHANGES b/CHANGES
index 4d55357a74f6ceef81310ff33401434c4ab107d1..b4726e5f444a6f6d08788bfa08183a8790a80c7b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,6 @@ OpenLDAP 2.0.13 Engineering
        Fixed back-ldbm dbhandle cache bug
        Fixed back-shell fgets handling
        Added slapd access to dn.base="" support
-       Added slapd extensible matching support (ITS#1302)
        Added -lldap improved TLS certificate checking
 
 OpenLDAP 2.0.12 Release

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 370a6030036d20d2fc29ef75d88f240bfc39dacd..8c2cf1502510acd5076236e485dbc5a7d04ccb41 100644 (file)
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -9,6 +9,10 @@ schemacheck    off
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
+# global ACLs
+access to dn.base="" attr=objectClass by users read
+access to * by * read
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
@@ -50,4 +54,4 @@ access                to filter="objectclass=groupofnames"
                by dn="^cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US$" +rw stop
                by * break
 
-access         to * by * read
+# fall into global ACLs