From af7f636c3d9e6d39b338d3fa43948d4a26a63beb Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 23 May 2000 19:47:54 +0000 Subject: [PATCH] s/rfc822mailgroup/groupofnames/ as we don't have a LDAPv3 mailgroup spec --- tests/data/acl.out.master | 27 ++++---------- tests/data/modify.out.master | 27 +++++--------- tests/data/modrdn.out.master | 25 ++++--------- tests/data/modrdn.out.master.0 | 25 ++++--------- tests/data/search.out.master | 66 +++++++++------------------------- tests/data/slapd-acl.conf | 2 +- tests/data/slapd-bdb2-acl.conf | 2 +- tests/data/slapd-dnssrv.conf | 4 +++ tests/data/test-ordered.ldif | 25 ++++--------- tests/data/test.ldif | 25 ++++--------- tests/scripts/test003-search | 4 +-- tests/scripts/test004-modify | 3 ++ tests/scripts/test006-acls | 4 +-- tests/scripts/test009-referral | 4 +-- 14 files changed, 70 insertions(+), 173 deletions(-) diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master index d88eaa1245..3c8e799f81 100644 --- a/tests/data/acl.out.master +++ b/tests/data/acl.out.master @@ -45,14 +45,10 @@ member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US cn: All Staff -joinable: FALSE -multilinedescription: Everyone in the sample data -objectclass: rfc822mailgroup +description: Everyone in the sample data +objectclass: groupofnames dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US @@ -68,14 +64,10 @@ member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich igan, c=US member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All Alumni Assoc Staff +description: All Alumni Assoc Staff cn: Alumni Assoc Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US objectclass: top @@ -149,14 +141,10 @@ objectclass: organizationalUnit ou: Information Technology Divisio dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All ITD Staff +description: All ITD Staff cn: ITD Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames member: cn=Manager, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US @@ -166,8 +154,7 @@ member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi ty of Michigan, c=US member: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US -labeledurl: http://www.itd.umich.edu ITD Home Page -telephonenumber: +1 810 555 1212 +ou: Groups dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=Unive rsity of Michigan, c=US diff --git a/tests/data/modify.out.master b/tests/data/modify.out.master index 69e72cd274..0f88c67e15 100644 --- a/tests/data/modify.out.master +++ b/tests/data/modify.out.master @@ -1,12 +1,10 @@ dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US cn: All Staff -joinable: FALSE -multilinedescription: Everyone in the sample data -objectclass: rfc822mailgroup +description: Everyone in the sample data +objectclass: groupofnames +member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of + Michigan, c=US dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US @@ -22,14 +20,10 @@ member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich igan, c=US member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All Alumni Assoc Staff +description: All Alumni Assoc Staff cn: Alumni Assoc Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US objectclass: top @@ -154,14 +148,10 @@ objectclass: organizationalUnit ou: Information Technology Divisio dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All ITD Staff +description: All ITD Staff cn: ITD Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames member: cn=Manager, o=University of Michigan, c=US member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi ty of Michigan, c=US @@ -169,7 +159,6 @@ member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US member: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US -labeledurl: http://www.itd.umich.edu ITD Home Page dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Mich igan, c=US diff --git a/tests/data/modrdn.out.master b/tests/data/modrdn.out.master index 8ec913d040..643ffc5b48 100644 --- a/tests/data/modrdn.out.master +++ b/tests/data/modrdn.out.master @@ -20,14 +20,10 @@ member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US cn: All Staff -joinable: FALSE -multilinedescription: Everyone in the sample data -objectclass: rfc822mailgroup +description: Everyone in the sample data +objectclass: groupofnames dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US @@ -43,14 +39,10 @@ member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich igan, c=US member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All Alumni Assoc Staff +description: All Alumni Assoc Staff cn: Alumni Assoc Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US objectclass: top @@ -151,14 +143,10 @@ objectclass: organizationalUnit ou: Information Technology Divisio dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All ITD Staff +description: All ITD Staff cn: ITD Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames member: cn=Manager, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US @@ -166,7 +154,6 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U niversity of Michigan, c=US member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi ty of Michigan, c=US -labeledurl: http://www.itd.umich.edu ITD Home Page dn: cn=James A Jones II, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US diff --git a/tests/data/modrdn.out.master.0 b/tests/data/modrdn.out.master.0 index 8ec913d040..643ffc5b48 100644 --- a/tests/data/modrdn.out.master.0 +++ b/tests/data/modrdn.out.master.0 @@ -20,14 +20,10 @@ member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US cn: All Staff -joinable: FALSE -multilinedescription: Everyone in the sample data -objectclass: rfc822mailgroup +description: Everyone in the sample data +objectclass: groupofnames dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US @@ -43,14 +39,10 @@ member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich igan, c=US member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All Alumni Assoc Staff +description: All Alumni Assoc Staff cn: Alumni Assoc Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US objectclass: top @@ -151,14 +143,10 @@ objectclass: organizationalUnit ou: Information Technology Divisio dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All ITD Staff +description: All ITD Staff cn: ITD Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames member: cn=Manager, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US @@ -166,7 +154,6 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U niversity of Michigan, c=US member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi ty of Michigan, c=US -labeledurl: http://www.itd.umich.edu ITD Home Page dn: cn=James A Jones II, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US diff --git a/tests/data/search.out.master b/tests/data/search.out.master index 4274c59fd0..025d252ece 100644 --- a/tests/data/search.out.master +++ b/tests/data/search.out.master @@ -76,14 +76,10 @@ member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US cn: All Staff -joinable: FALSE -multilinedescription: Everyone in the sample data -objectclass: rfc822mailgroup +description: Everyone in the sample data +objectclass: groupofnames dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US @@ -99,24 +95,16 @@ member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich igan, c=US member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All Alumni Assoc Staff +description: All Alumni Assoc Staff cn: Alumni Assoc Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All ITD Staff +description: All ITD Staff cn: ITD Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames member: cn=Manager, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US @@ -124,7 +112,6 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U niversity of Michigan, c=US member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi ty of Michigan, c=US -labeledurl: http://www.itd.umich.edu ITD Home Page dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Mich igan, c=US @@ -174,14 +161,10 @@ member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US cn: All Staff -joinable: FALSE -multilinedescription: Everyone in the sample data -objectclass: rfc822mailgroup +description: Everyone in the sample data +objectclass: groupofnames dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US @@ -197,14 +180,10 @@ member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich igan, c=US member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All Alumni Assoc Staff +description: All Alumni Assoc Staff cn: Alumni Assoc Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US member: cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=Un @@ -227,14 +206,10 @@ member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US cn: All Staff -joinable: FALSE -multilinedescription: Everyone in the sample data -objectclass: rfc822mailgroup +description: Everyone in the sample data +objectclass: groupofnames dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US @@ -250,14 +225,10 @@ member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich igan, c=US member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All Alumni Assoc Staff +description: All Alumni Assoc Staff cn: Alumni Assoc Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US objectclass: top @@ -276,14 +247,10 @@ objectclass: organizationalUnit ou: Information Technology Divisio dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All ITD Staff +description: All ITD Staff cn: ITD Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames member: cn=Manager, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US @@ -291,7 +258,6 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U niversity of Michigan, c=US member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi ty of Michigan, c=US -labeledurl: http://www.itd.umich.edu ITD Home Page dn: ou=People, o=University of Michigan, c=US objectclass: top diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index a4c7aa9b45..c52b970067 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -44,7 +44,7 @@ access to attr=member by dnattr=member selfwrite by * read -access to filter="objectclass=rfc822mailgroup" +access to filter="objectclass=groupofnames" by dn="^cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US$" =sc continue by dn="^cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US$" +rw stop by * break diff --git a/tests/data/slapd-bdb2-acl.conf b/tests/data/slapd-bdb2-acl.conf index 50769f3ad2..2768f50b34 100644 --- a/tests/data/slapd-bdb2-acl.conf +++ b/tests/data/slapd-bdb2-acl.conf @@ -43,7 +43,7 @@ access to attr=member by dnattr=member selfwrite by * read -access to filter="objectclass=rfc822mailgroup" +access to filter="objectclass=groupofnames" by dn="Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US" write by * read diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf index 5361a9aa1d..5516869e02 100644 --- a/tests/data/slapd-dnssrv.conf +++ b/tests/data/slapd-dnssrv.conf @@ -4,6 +4,10 @@ # include ./data/slapd.at.conf include ./data/slapd.oc.conf +#include ../../servers/slapd/schema/core.schema +#include ../../servers/slapd/schema/openldap.schema +#include ../../servers/slapd/schema/cosine.schema +#include ../../servers/slapd/schema/inetorgperson.schema schemacheck on pidfile ./test-db/slapd.pid argsfile ./test-db/slapd.args diff --git a/tests/data/test-ordered.ldif b/tests/data/test-ordered.ldif index 3db5bb98ec..03c19b5664 100644 --- a/tests/data/test-ordered.ldif +++ b/tests/data/test-ordered.ldif @@ -59,14 +59,10 @@ member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US cn: All Staff -joinable: FALSE -multilinedescription: Everyone in the sample data -objectclass: rfc822mailgroup +description: Everyone in the sample data +objectclass: groupofnames dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US @@ -82,14 +78,10 @@ member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich igan, c=US member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All Alumni Assoc Staff +description: All Alumni Assoc Staff cn: Alumni Assoc Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames dn: cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=Univer sity of Michigan, c=US @@ -174,14 +166,10 @@ mail: dots@mail.alumni.umich.edu homephone: +1 313 555 0454 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All ITD Staff +description: All ITD Staff cn: ITD Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames member: cn=Manager, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US @@ -189,7 +177,6 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U niversity of Michigan, c=US member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi ty of Michigan, c=US -labeledurl: http://www.itd.umich.edu ITD Home Page dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Mich igan, c=US diff --git a/tests/data/test.ldif b/tests/data/test.ldif index e658ae0db1..07fcc1dc7b 100644 --- a/tests/data/test.ldif +++ b/tests/data/test.ldif @@ -20,14 +20,10 @@ member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US cn: All Staff -joinable: FALSE -multilinedescription: Everyone in the sample data -objectclass: rfc822mailgroup +description: Everyone in the sample data +objectclass: groupofnames dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US member: cn=Manager, o=University of Michigan, c=US @@ -43,14 +39,10 @@ member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich igan, c=US member: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Michigan, c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All Alumni Assoc Staff +description: All Alumni Assoc Staff cn: Alumni Assoc Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US objectclass: top @@ -151,14 +143,10 @@ objectclass: organizationalUnit ou: Information Technology Divisio dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -associateddomain: umich.edu -requeststo: cn=Manager, o=University of Michigan, c=US -errorsto: cn=Manager, o=University of Michigan, c=US owner: cn=Manager, o=University of Michigan, c=US -multilinedescription: All ITD Staff +description: All ITD Staff cn: ITD Staff -joinable: FALSE -objectclass: rfc822mailgroup +objectclass: groupofnames member: cn=Manager, o=University of Michigan, c=US member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=Univ ersity of Michigan, c=US @@ -166,7 +154,6 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U niversity of Michigan, c=US member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi ty of Michigan, c=US -labeledurl: http://www.itd.umich.edu ITD Home Page dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Mich igan, c=US diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search index 7a061dba83..0f662247f1 100755 --- a/tests/scripts/test003-search +++ b/tests/scripts/test003-search @@ -59,7 +59,7 @@ fi echo "Testing OR searching..." $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \ - '(|(objectclass=rfc822mailgroup)(sn=jones))' >> $SEARCHOUT 2>&1 + '(|(objectclass=groupofnames)(sn=jones))' >> $SEARCHOUT 2>&1 if test $RC != 0 ; then echo "ldapsearch failed!" kill -HUP $PID @@ -68,7 +68,7 @@ fi echo "Testing AND matching and ends-with searching..." $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \ - '(&(objectclass=rfc822mailgroup)(cn=A*))' >> $SEARCHOUT 2>&1 + '(&(objectclass=groupofnames)(cn=A*))' >> $SEARCHOUT 2>&1 if test $RC != 0 ; then echo "ldapsearch failed!" kill -HUP $PID diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index 42cfdb2ea3..7cdd35b12b 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -82,6 +82,9 @@ member: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Mi dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US changetype: modify delete: member +- +add: member +member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US changetype: add diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index d4d1b49003..44952801e0 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -108,9 +108,9 @@ dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US # comment changetype: modify # comment -add: telephonenumber +add: ou # comment -telephonenumber: +1 810 555 1212 +ou: Groups # comment EOMODS4 diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral index cf339e7615..ae0fb9b4af 100755 --- a/tests/scripts/test009-referral +++ b/tests/scripts/test009-referral @@ -79,7 +79,7 @@ fi echo "Testing OR searching..." $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $SLAVEPORT \ - '(|(objectclass=rfc822mailgroup)(sn=jones))' >> $SEARCHOUT 2>&1 + '(|(objectclass=groupofnames)(sn=jones))' >> $SEARCHOUT 2>&1 if test $RC != 0 ; then echo "ldapsearch failed!" kill -HUP $PID $SLAVEPID @@ -88,7 +88,7 @@ fi echo "Testing AND matching and ends-with searching..." $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $SLAVEPORT \ - '(&(objectclass=rfc822mailgroup)(cn=A*))' >> $SEARCHOUT 2>&1 + '(&(objectclass=groupofnames)(cn=A*))' >> $SEARCHOUT 2>&1 if test $RC != 0 ; then echo "ldapsearch failed!" kill -HUP $PID $SLAVEPID -- 2.39.5