From 68a192485dc9b3db9d8b0ac8f3c87ce4f9fedbb3 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 1 Aug 2006 03:03:43 +0000
Subject: [PATCH] Use "attrs=" instead of deprecated "attr="

---
 tests/data/slapd-acl.conf            | 18 +++++++++---------
 tests/data/slapd-ldapglue.conf       |  2 +-
 tests/data/slapd-ldapgluegroups.conf |  2 +-
 tests/data/slapd-ldapgluepeople.conf |  2 +-
 tests/data/slapd-ppolicy.conf        |  2 +-
 tests/data/slapd-pw.conf             |  2 +-
 tests/data/slapd-whoami.conf         |  4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index c9278ec3e4..d63d824dc0 100644
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -27,7 +27,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
@@ -54,12 +54,12 @@ rootpw		secret
 #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
 
@@ -69,15 +69,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"
diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf
index 26d7d2b562..c05a0a317f 100644
--- a/tests/data/slapd-ldapglue.conf
+++ b/tests/data/slapd-ldapglue.conf
@@ -41,7 +41,7 @@ authz-regexp	"^uid=([^,]+),.*" "uid=$1,ou=People,dc=example,dc=com"
 # cn=monitor, cn=schema, and cn=config
 #
 
-access to attr=userpassword
+access to attrs=userpassword
 	by self =wx
 	by anonymous =x
 
diff --git a/tests/data/slapd-ldapgluegroups.conf b/tests/data/slapd-ldapgluegroups.conf
index 3037624c0b..a44d7aabb1 100644
--- a/tests/data/slapd-ldapgluegroups.conf
+++ b/tests/data/slapd-ldapgluegroups.conf
@@ -40,7 +40,7 @@ authz-regexp	"^uid=([^,]+),.*" "uid=$1,ou=Groups,dc=example,dc=com"
 # cn=monitor, cn=schema, and cn=config
 #
 
-access to attr=userpassword
+access to attrs=userpassword
 	by self =wx
 	by anonymous =x
 
diff --git a/tests/data/slapd-ldapgluepeople.conf b/tests/data/slapd-ldapgluepeople.conf
index 0798eeddb8..92c8488e0d 100644
--- a/tests/data/slapd-ldapgluepeople.conf
+++ b/tests/data/slapd-ldapgluepeople.conf
@@ -40,7 +40,7 @@ authz-regexp	"^uid=([^,]+),.*" "uid=$1,ou=People,dc=example,dc=com"
 # cn=monitor, cn=schema, and cn=config
 #
 
-access to attr=userpassword
+access to attrs=userpassword
 	by dn.exact="uid=proxy,ou=People,dc=example,dc=com" read
 	by self =wx
 	by anonymous =x
diff --git a/tests/data/slapd-ppolicy.conf b/tests/data/slapd-ppolicy.conf
index 6a31bc4dd9..a87d5803be 100644
--- a/tests/data/slapd-ppolicy.conf
+++ b/tests/data/slapd-ppolicy.conf
@@ -45,7 +45,7 @@ overlay		ppolicy
 ppolicy_default	"cn=Standard Policy,ou=Policies,dc=example,dc=com"
 ppolicy_use_lockout
 
-access to attr=userpassword
+access to attrs=userpassword
 	by self write
 	by * auth
 
diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index 05fd80a99e..d56bdcb421 100644
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -49,7 +49,7 @@ rootpw		secret
 # cn=monitor, cn=schema, and cn=config
 #
 
-access to attr=userpassword
+access to attrs=userpassword
 	by anonymous auth
 	by self write
 
diff --git a/tests/data/slapd-whoami.conf b/tests/data/slapd-whoami.conf
index 4be27d5079..89ae3b4102 100644
--- a/tests/data/slapd-whoami.conf
+++ b/tests/data/slapd-whoami.conf
@@ -40,10 +40,10 @@ authz-regexp	"^uid=([^,]+),.*" "ldap:///dc=example,dc=com??sub?uid=$1"
 # cn=monitor, cn=schema, and cn=config
 #
 
-access to attr=authzFrom,authzTo
+access to attrs=authzFrom,authzTo
 	by * auth
 
-access to attr=userpassword
+access to attrs=userpassword
 	by anonymous auth
 	by self write
 
-- 
GitLab