From: Pierangelo Masarati Date: Sun, 7 Aug 2005 00:27:48 +0000 (+0000) Subject: disallow this test for backends that do not honor ACLs X-Git-Tag: OPENLDAP_AC_BP~88 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc6b90b45235dd4aa327d0cf0634be9e04995eed;p=openldap disallow this test for backends that do not honor ACLs --- diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master index 8b0134895e..db6c1fb015 100644 --- a/tests/data/acl.out.master +++ b/tests/data/acl.out.master @@ -21,18 +21,18 @@ facsimileTelephoneNumber: +1 313 555 4332 telephoneNumber: +1 313 555 0895 # Using ldapsearch to retrieve all the entries... -dn: ou=Add/Delete,dc=example,dc=com +dn: ou=Add & Delete,dc=example,dc=com objectClass: organizationalUnit -ou: Add/Delete +ou: Add & Delete -dn: cn=Added by Bjorn (must succeed),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (must succeed),ou=Add & Delete,dc=example,dc=com objectClass: inetOrgPerson cn: Added by Bjorn (must succeed) sn: None description: this attribute value has been added __after__entry creation description: Bjorn will try to delete this attribute value (should fail) -dn: cn=Added by Bjorn (renamed by Jaj),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (renamed by Jaj),ou=Add & Delete,dc=example,dc=com objectClass: inetOrgPerson sn: None cn: Added by Bjorn (renamed by Jaj) diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index c56586bff1..6d6c8faa7c 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -95,7 +95,7 @@ access to dn.exact="cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com" access to filter="(name=X*Y*Z)" by * continue -access to dn.subtree="ou=Add/Delete,dc=example,dc=com" +access to dn.subtree="ou=Add & Delete,dc=example,dc=com" by dn.exact="cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com" add by dn.exact="cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com" delete by dn.exact="cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com" write diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index 20a367f6ac..e93dbe9638 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -13,6 +13,14 @@ ## top-level directory of the distribution or, alternatively, at ## . +case "$BACKEND" in +bdb|hdb|ldbm) + ;; +*) + echo "Test does not support $BACKEND backend" + exit 0 +esac + echo "running defines.sh" . $SRCDIR/scripts/defines.sh @@ -174,15 +182,15 @@ EOMODS6 $LDAPMODIFY -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \ $TESTOUT 2>&1 << EOMODS7 -dn: ou=Add/Delete,dc=example,dc=com +dn: ou=Add & Delete,dc=example,dc=com changetype: add objectClass: organizationalUnit -ou: Add/Delete +ou: Add & Delete EOMODS7 $LDAPMODIFY -D "$BABSDN" -h $LOCALHOST -p $PORT1 -w bjensen >> \ $TESTOUT 2>&1 << EOMODS8 -dn: cn=Added by Babs (must fail),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Babs (must fail),ou=Add & Delete,dc=example,dc=com changetype: add objectClass: inetOrgPerson cn: Added by Babs (must fail) @@ -191,25 +199,25 @@ EOMODS8 $LDAPMODIFY -D "$BJORNSDN" -h $LOCALHOST -p $PORT1 -w bjorn >> \ $TESTOUT 2>&1 << EOMODS9 -dn: cn=Added by Bjorn (must succeed),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (must succeed),ou=Add & Delete,dc=example,dc=com changetype: add objectClass: inetOrgPerson cn: Added by Bjorn (must succeed) sn: None -dn: cn=Added by Bjorn (will be deleted),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (will be deleted),ou=Add & Delete,dc=example,dc=com changetype: add objectClass: inetOrgPerson cn: Added by Bjorn (will be deleted) sn: None -dn: cn=Added by Bjorn (will be renamed),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (will be renamed),ou=Add & Delete,dc=example,dc=com changetype: add objectClass: inetOrgPerson cn: Added by Bjorn (will be renamed) sn: None -dn: cn=Added by Bjorn (must succeed),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (must succeed),ou=Add & Delete,dc=example,dc=com changetype: modify add: description description: this attribute value has been added __after__entry creation @@ -220,13 +228,13 @@ EOMODS9 $LDAPMODIFY -D "$BJORNSDN" -h $LOCALHOST -p $PORT1 -w bjorn >> \ $TESTOUT 2>&1 << EOMODS10 -dn: cn=Added by Bjorn (will be deleted),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (will be deleted),ou=Add & Delete,dc=example,dc=com changetype: delete EOMODS10 $LDAPMODIFY -D "$BJORNSDN" -h $LOCALHOST -p $PORT1 -w bjorn >> \ $TESTOUT 2>&1 << EOMODS11 -dn: cn=Added by Bjorn (will be renamed),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (will be renamed),ou=Add & Delete,dc=example,dc=com changetype: modrdn newrdn: cn=Added by Bjorn (renamed by Bjorn) deleteoldrdn: 1 @@ -234,7 +242,7 @@ EOMODS11 $LDAPMODIFY -D "$BABSDN" -h $LOCALHOST -p $PORT1 -w bjensen >> \ $TESTOUT 2>&1 << EOMODS12 -dn: cn=Added by Bjorn (will be renamed),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (will be renamed),ou=Add & Delete,dc=example,dc=com changetype: modrdn newrdn: cn=Added by Bjorn (renamed by Babs) deleteoldrdn: 1 @@ -242,7 +250,7 @@ EOMODS12 $LDAPMODIFY -D "$JAJDN" -h $LOCALHOST -p $PORT1 -w jaj >> \ $TESTOUT 2>&1 << EOMODS13 -dn: cn=Added by Bjorn (will be renamed),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (will be renamed),ou=Add & Delete,dc=example,dc=com changetype: modrdn newrdn: cn=Added by Bjorn (renamed by Jaj) deleteoldrdn: 1 @@ -250,7 +258,7 @@ EOMODS13 $LDAPMODIFY -D "$BJORNSDN" -h $LOCALHOST -p $PORT1 -w bjorn >> \ $TESTOUT 2>&1 << EOMODS14 -dn: cn=Added by Bjorn (must succeed),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (must succeed),ou=Add & Delete,dc=example,dc=com changetype: modify delete: description description: Bjorn will try to delete this attribute value (should fail) @@ -259,10 +267,10 @@ EOMODS14 $LDAPMODIFY -D "$BABSDN" -h $LOCALHOST -p $PORT1 -w bjensen >> \ $TESTOUT 2>&1 << EOMODS15 -dn: cn=Added by Bjorn (will be deleted),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (will be deleted),ou=Add & Delete,dc=example,dc=com changetype: delete -dn: cn=Added by Bjorn (must succeed),ou=Add/Delete,dc=example,dc=com +dn: cn=Added by Bjorn (must succeed),ou=Add & Delete,dc=example,dc=com changetype: modify delete: description description: this attribute value will be deleted by Babs (must succeed)