Remove use of quipu object classes

diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master
index 7f673545c76628892fb6f72e9088829d932f2c68..d88eaa12451cfa70fd906269702432d6c1bc1b68 100644 (file)
--- a/tests/data/acl.out.master
+++ b/tests/data/acl.out.master
@@ -80,8 +80,6 @@ objectclass: rfc822mailgroup
 dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Alumni Association
 
 dn: cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=Univer
@@ -142,16 +140,12 @@ telephonenumber: +1 313 555 0355
 dn: ou=Groups, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Groups
 
 dn: ou=Information Technology Division, ou=People, o=University of Michigan, c
  =US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Information Technology Divisio
 
 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
@@ -229,7 +223,6 @@ telephonenumber: +1 313 555 9394
 dn: cn=Manager, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
-objectclass: quipuObject
 objectclass: kerberosSecurityObject
 cn: Manager
 cn: Directory Manager
@@ -241,16 +234,12 @@ krbname: bjensen@umich.edu
 dn: ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: People
 
 dn: o=University of Michigan, c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 l: Ann Arbor, Michigan
 st: Michigan
 streetaddress: 535 West William St.

diff --git a/tests/data/modify.out.master b/tests/data/modify.out.master
index 451183179d5eb76bdf1058294cd554b2f8181d43..69e72cd274b0e1597adb41c587ff1cce74f2230a 100644 (file)
--- a/tests/data/modify.out.master
+++ b/tests/data/modify.out.master
@@ -34,8 +34,6 @@ objectclass: rfc822mailgroup
 dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Alumni Association
 
 dn: cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=Univer
@@ -147,16 +145,12 @@ homephone: +1 313 555 8844
 dn: ou=Groups, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Groups
 
 dn: ou=Information Technology Division, ou=People, o=University of Michigan, c
  =US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Information Technology Divisio
 
 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
@@ -284,7 +278,6 @@ telephonenumber: +1 313 555 9394
 dn: cn=Manager, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
-objectclass: quipuObject
 objectclass: kerberosSecurityObject
 cn: Manager
 cn: Directory Manager
@@ -322,16 +315,12 @@ telephonenumber: +1 313 555 4177
 dn: ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: People
 
 dn: o=University of Michigan, c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 l: Ann Arbor, Michigan
 st: Michigan
 streetaddress: 535 West William St.

diff --git a/tests/data/modrdn.out.master b/tests/data/modrdn.out.master
index 1e557aeec663e5462c69dbd2f4ac6125e7c756f7..8ec913d040321bcd59b54502bf0e8c44d594e63a 100644 (file)
--- a/tests/data/modrdn.out.master
+++ b/tests/data/modrdn.out.master
@@ -55,8 +55,6 @@ objectclass: rfc822mailgroup
 dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Alumni Association
 
 dn: cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=Univer
@@ -144,16 +142,12 @@ homephone: +1 313 555 0454
 dn: ou=Groups, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Groups
 
 dn: ou=Information Technology Division, ou=People, o=University of Michigan, c
  =US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Information Technology Divisio
 
 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
@@ -307,7 +301,6 @@ telephonenumber: +1 313 555 9394
 dn: cn=Manager, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
-objectclass: quipuObject
 objectclass: kerberosSecurityObject
 cn: Manager
 cn: Directory Manager
@@ -345,16 +338,12 @@ telephonenumber: +1 313 555 4177
 dn: ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: People
 
 dn: o=University of Michigan, c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 l: Ann Arbor, Michigan
 st: Michigan
 streetaddress: 535 West William St.

diff --git a/tests/data/modrdn.out.master.0 b/tests/data/modrdn.out.master.0
index 1e557aeec663e5462c69dbd2f4ac6125e7c756f7..8ec913d040321bcd59b54502bf0e8c44d594e63a 100644 (file)
--- a/tests/data/modrdn.out.master.0
+++ b/tests/data/modrdn.out.master.0
@@ -55,8 +55,6 @@ objectclass: rfc822mailgroup
 dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Alumni Association
 
 dn: cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=Univer
@@ -144,16 +142,12 @@ homephone: +1 313 555 0454
 dn: ou=Groups, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Groups
 
 dn: ou=Information Technology Division, ou=People, o=University of Michigan, c
  =US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Information Technology Divisio
 
 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
@@ -307,7 +301,6 @@ telephonenumber: +1 313 555 9394
 dn: cn=Manager, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
-objectclass: quipuObject
 objectclass: kerberosSecurityObject
 cn: Manager
 cn: Directory Manager
@@ -345,16 +338,12 @@ telephonenumber: +1 313 555 4177
 dn: ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: People
 
 dn: o=University of Michigan, c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 l: Ann Arbor, Michigan
 st: Michigan
 streetaddress: 535 West William St.

diff --git a/tests/data/search.out.master b/tests/data/search.out.master
index 310cdf864d6b169bccaccca9c64d9392123f387b..4274c59fd0bb6d97e31230e280052a973720014c 100644 (file)
--- a/tests/data/search.out.master
+++ b/tests/data/search.out.master
@@ -262,23 +262,17 @@ objectclass: rfc822mailgroup
 dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Alumni Association
 
 dn: ou=Groups, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Groups
 
 dn: ou=Information Technology Division, ou=People, o=University of Michigan, c
  =US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Information Technology Divisio
 
 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
@@ -302,16 +296,12 @@ labeledurl: http://www.itd.umich.edu ITD Home Page
 dn: ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: People
 
 dn: o=University of Michigan, c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 l: Ann Arbor, Michigan
 st: Michigan
 streetaddress: 535 West William St.

diff --git a/tests/data/test-ordered.ldif b/tests/data/test-ordered.ldif
index 80011669882d552b7416d08f7edb91999f61758b..3db5bb98ec91db7634427fad8ee19b25502ca265 100644 (file)
--- a/tests/data/test-ordered.ldif
+++ b/tests/data/test-ordered.ldif
@@ -2,8 +2,6 @@ dn: o=University of Michigan, c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 l: Ann Arbor, Michigan
 st: Michigan
 streetaddress: 535 West William St.
@@ -21,30 +19,22 @@ associateddomain: umich.edu
 dn: ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: People
 
 dn: ou=Groups, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Groups
 
 dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Alumni Association
 
 dn: ou=Information Technology Division, ou=People, o=University of Michigan, c
  =US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Information Technology Divisio
 
 dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US
@@ -333,7 +323,6 @@ telephonenumber: +1 313 555 9394
 dn: cn=Manager, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
-objectclass: quipuObject
 objectclass: kerberosSecurityObject
 cn: Manager
 cn: Directory Manager

diff --git a/tests/data/test.ldif b/tests/data/test.ldif
index e68250771553b080afc9739e5ff6b02575a7d2b0..e658ae0db10d8bcbfc48eda734f5a3f70fa69fb9 100644 (file)
--- a/tests/data/test.ldif
+++ b/tests/data/test.ldif
@@ -55,8 +55,6 @@ objectclass: rfc822mailgroup
 dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Alumni Association
 
 dn: cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=Univer
@@ -144,16 +142,12 @@ homephone: +1 313 555 0454
 dn: ou=Groups, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Groups
 
 dn: ou=Information Technology Division, ou=People, o=University of Michigan, c
  =US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: Information Technology Divisio
 
 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
@@ -306,7 +300,6 @@ telephonenumber: +1 313 555 9394
 dn: cn=Manager, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
-objectclass: quipuObject
 objectclass: kerberosSecurityObject
 cn: Manager
 cn: Directory Manager
@@ -344,16 +337,12 @@ telephonenumber: +1 313 555 4177
 dn: ou=People, o=University of Michigan, c=US
 objectclass: top
 objectclass: organizationalUnit
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 ou: People
 
 dn: o=University of Michigan, c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
-objectclass: quipuObject
-objectclass: quipuNonLeafObject
 l: Ann Arbor, Michigan
 st: Michigan
 streetaddress: 535 West William St.