s/rfc822mailgroup/groupofnames/ as we don't have a LDAPv3 mailgroup spec

diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master
index d88eaa12451cfa70fd906269702432d6c1bc1b68..3c8e799f816368717a733e8a7bc5287a8ca6ff28 100644 (file)
--- 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 69e72cd274b0e1597adb41c587ff1cce74f2230a..0f88c67e1543f04a46b12e996e40a3b4323968c0 100644 (file)
--- 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 8ec913d040321bcd59b54502bf0e8c44d594e63a..643ffc5b48e7a2ff1d7b4edce7b283a4f430202a 100644 (file)
--- 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 8ec913d040321bcd59b54502bf0e8c44d594e63a..643ffc5b48e7a2ff1d7b4edce7b283a4f430202a 100644 (file)
--- 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 4274c59fd0bb6d97e31230e280052a973720014c..025d252ece6ee5ccdee4b30a35cf533d5b766156 100644 (file)
--- 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 a4c7aa9b459b1b603c697ef9d973b507251e3783..c52b9700670efaf0f9dc361b1dbe0c55d97bdba8 100644 (file)
--- 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 50769f3ad23b4c7cfc93fc584b549618ca228ffc..2768f50b34acf2b6ed052daacb85df2ac90760ae 100644 (file)
--- 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 5361a9aa1df53ce6dc3a714e3e481dded0101e75..5516869e02f6aa810cca115df87f4976121056cf 100644 (file)
--- 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 3db5bb98ec91db7634427fad8ee19b25502ca265..03c19b566470cdfa5575fab85d50f4774ea47ca1 100644 (file)
--- 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 e658ae0db10d8bcbfc48eda734f5a3f70fa69fb9..07fcc1dc7bcc9b50da0a1add6d74eb5913e8ed40 100644 (file)
--- 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 7a061dba83f398c249a3857c4f96d3e34d463508..0f662247f16069cc9aa667dc6976a9adf588143f 100755 (executable)
--- 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 42cfdb2ea3563012b74bd0cb8333b7005ce5e9b2..7cdd35b12b8b3822bac37e8c191c1e280eccd1ac 100755 (executable)
--- 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 d4d1b49003fb3a0087940422863839581117e5c5..44952801e01f6e800c8531d6f24883e5d1540032 100755 (executable)
--- 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 cf339e76154c5902681bd2b6f2418fd08172adc9..ae0fb9b4afc0054b8fdc68b3a06541d783bcfe56 100755 (executable)
--- 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