From: Kurt Zeilenga <kurt@openldap.org> Date: Tue, 27 Aug 2002 21:41:37 +0000 (+0000) Subject: Trim subordinate classes from input (and expected output). X-Git-Tag: NO_SLAP_OP_BLOCKS~1153 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4fa2b1234274233ea16b2ee298f4cc33a21d229b;p=openldap Trim subordinate classes from input (and expected output). --- diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master index 5113bc17da..0300c166c4 100644 --- a/tests/data/acl.out.master +++ b/tests/data/acl.out.master @@ -1,7 +1,5 @@ dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -66,14 +64,11 @@ cn: Alumni Assoc Staff objectclass: groupofnames dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Alumni Association dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen @@ -94,8 +89,6 @@ telephonenumber: +1 313 555 9022 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen @@ -114,12 +107,10 @@ facsimiletelephonenumber: +1 313 555 2177 telephonenumber: +1 313 555 0355 dn: ou=Groups,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Groups dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Information Technology Division @@ -141,8 +132,6 @@ ou: Groups dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Universi ty of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 2 cn: James Jones @@ -162,8 +151,6 @@ telephonenumber: +1 313 555 7334 dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M ichigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: John Doe cn: Jonathon Doe @@ -181,7 +168,6 @@ facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 dn: cn=Manager,o=University of Michigan,c=US -objectclass: top objectclass: person cn: Manager cn: Directory Manager @@ -190,12 +176,10 @@ sn: Manager description: Manager of the directory dn: ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: People dn: o=University of Michigan,c=US -objectclass: top objectclass: organization objectclass: domainRelatedObject l: Ann Arbor, Michigan diff --git a/tests/data/do_add.1 b/tests/data/do_add.1 index c978a70854..f54182d170 100644 --- a/tests/data/do_add.1 +++ b/tests/data/do_add.1 @@ -1,6 +1,4 @@ cn=James A Jones 2,ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 2 cn: James Jones diff --git a/tests/data/do_add.2 b/tests/data/do_add.2 index 9486d4f395..728823de7f 100644 --- a/tests/data/do_add.2 +++ b/tests/data/do_add.2 @@ -1,6 +1,4 @@ cn=James A Jones 3,ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 3 cn: James Jones diff --git a/tests/data/do_add.3 b/tests/data/do_add.3 index a4808dbac9..f0d4d26b27 100644 --- a/tests/data/do_add.3 +++ b/tests/data/do_add.3 @@ -1,6 +1,4 @@ cn=James A Jones 4,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 4 cn: James Jones diff --git a/tests/data/do_add.4 b/tests/data/do_add.4 index c03bcd509d..9dc9e4ad34 100644 --- a/tests/data/do_add.4 +++ b/tests/data/do_add.4 @@ -1,6 +1,4 @@ cn=James A Jones 5,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 5 cn: James Jones diff --git a/tests/data/lang-out.ldif b/tests/data/lang-out.ldif index 5d96a20b21..45d1a1580f 100644 --- a/tests/data/lang-out.ldif +++ b/tests/data/lang-out.ldif @@ -1,5 +1,4 @@ dn: o=University of Michigan,c=US -objectClass: top objectClass: organization objectClass: extensibleObject o: University of Michigan diff --git a/tests/data/modify.out.master b/tests/data/modify.out.master index 023892e496..7a29e3f54b 100644 --- a/tests/data/modify.out.master +++ b/tests/data/modify.out.master @@ -26,14 +26,11 @@ cn: Alumni Assoc Staff objectclass: groupofnames dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Alumni Association dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen @@ -55,8 +52,6 @@ telephonenumber: +1 313 555 9022 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen @@ -78,8 +73,6 @@ drink: Mad Dog 20/20 dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens @@ -98,8 +91,6 @@ homephone: +1 313 555 0454 dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,o=University o f Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Gern Jensen sn: Jensen @@ -116,12 +107,10 @@ mail: gjensen@mailgw.umich.edu homephone: +1 313 555 8844 dn: ou=Groups,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Groups dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Information Technology Division @@ -140,8 +129,6 @@ member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mic dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -162,8 +149,6 @@ telephonenumber: +1 313 555 0895 drink: Orange Juice dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson @@ -183,8 +168,6 @@ telephonenumber: +1 313 555 4774 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan ,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jennifer Smith cn: Jen Smith @@ -203,8 +186,6 @@ telephonenumber: +1 313 555 8232 dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M ichigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: John Doe cn: Jonathon Doe @@ -222,7 +203,6 @@ facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 dn: cn=Manager,o=University of Michigan,c=US -objectclass: top objectclass: person cn: Manager cn: Directory Manager @@ -233,8 +213,6 @@ userpassword:: c2VjcmV0 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Mark Elliot cn: Mark A Elliot @@ -252,12 +230,10 @@ facsimiletelephonenumber: +1 313 555 7762 telephonenumber: +1 313 555 4177 dn: ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: People dn: o=University of Michigan,c=US -objectclass: top objectclass: organization objectclass: domainRelatedObject l: Ann Arbor, Michigan @@ -275,8 +251,6 @@ associateddomain: umich.edu dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Ursula Hampster sn: Hampster diff --git a/tests/data/modrdn.out.master b/tests/data/modrdn.out.master index 53e4ef8728..d0cf29c272 100644 --- a/tests/data/modrdn.out.master +++ b/tests/data/modrdn.out.master @@ -45,14 +45,11 @@ cn: Alumni Assoc Staff objectclass: groupofnames dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Alumni Association dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Univer sity of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen @@ -74,8 +71,6 @@ telephonenumber: +1 313 555 9022 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Universi ty of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen @@ -96,8 +91,6 @@ telephonenumber: +1 313 555 0355 dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mich igan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens @@ -115,13 +108,11 @@ mail: dots@mail.alumni.umich.edu homephone: +1 313 555 0454 dn: ou=Groups,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Groups dn: ou=Information Technology Division,ou=People,o=University of Michigan,c =US -objectclass: top objectclass: organizationalUnit ou: Information Technology Division @@ -140,8 +131,6 @@ member: cn=John Doe,ou=Information Technology Division,ou=People,o=University dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univ ersity of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James Jones cn: Jim Jones @@ -161,8 +150,6 @@ telephonenumber: +1 313 555 7334 dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Mi chigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -184,8 +171,6 @@ telephonenumber: +1 313 555 0895 dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c =US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson @@ -205,8 +190,6 @@ telephonenumber: +1 313 555 4774 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michi gan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jennifer Smith cn: Jen Smith @@ -225,8 +208,6 @@ telephonenumber: +1 313 555 8232 dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University o f Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: John Doe cn: Jonathon Doe @@ -244,7 +225,6 @@ facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 dn: cn=Manager,o=University of Michigan,c=US -objectclass: top objectclass: person cn: Manager cn: Directory Manager @@ -255,8 +235,6 @@ userpassword:: c2VjcmV0 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan ,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Mark Elliot cn: Mark A Elliot @@ -274,12 +252,10 @@ facsimiletelephonenumber: +1 313 555 7762 telephonenumber: +1 313 555 4177 dn: ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: People dn: o=University of Michigan,c=US -objectclass: top objectclass: organization objectclass: domainRelatedObject l: Ann Arbor, Michigan @@ -297,8 +273,6 @@ associateddomain: umich.edu dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich igan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Ursula Hampster sn: Hampster diff --git a/tests/data/modrdn.out.master.0 b/tests/data/modrdn.out.master.0 index 34a1fe9617..58e584d961 100644 --- a/tests/data/modrdn.out.master.0 +++ b/tests/data/modrdn.out.master.0 @@ -45,14 +45,11 @@ cn: Alumni Assoc Staff objectclass: groupofnames dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Alumni Association dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen @@ -74,8 +71,6 @@ telephonenumber: +1 313 555 9022 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen @@ -96,8 +91,6 @@ telephonenumber: +1 313 555 0355 dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens @@ -115,12 +108,10 @@ mail: dots@mail.alumni.umich.edu homephone: +1 313 555 0454 dn: ou=Groups,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Groups dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Information Technology Division @@ -139,8 +130,6 @@ member: cn=John Doe,ou=Information Technology Division,ou=People,o=University dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univers ity of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James Jones cn: Jim Jones @@ -160,8 +149,6 @@ telephonenumber: +1 313 555 7334 dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Michi gan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -182,8 +169,6 @@ facsimiletelephonenumber: +1 313 555 4332 telephonenumber: +1 313 555 0895 dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson @@ -203,8 +188,6 @@ telephonenumber: +1 313 555 4774 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan ,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jennifer Smith cn: Jen Smith @@ -223,8 +206,6 @@ telephonenumber: +1 313 555 8232 dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M ichigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: John Doe cn: Jonathon Doe @@ -242,7 +223,6 @@ facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 dn: cn=Manager,o=University of Michigan,c=US -objectclass: top objectclass: person cn: Manager cn: Directory Manager @@ -253,8 +233,6 @@ userpassword:: c2VjcmV0 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Mark Elliot cn: Mark A Elliot @@ -272,12 +250,10 @@ facsimiletelephonenumber: +1 313 555 7762 telephonenumber: +1 313 555 4177 dn: ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: People dn: o=University of Michigan,c=US -objectclass: top objectclass: organization objectclass: domainRelatedObject l: Ann Arbor, Michigan @@ -295,8 +271,6 @@ associateddomain: umich.edu dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Ursula Hampster sn: Hampster diff --git a/tests/data/modrdn.out.master.1 b/tests/data/modrdn.out.master.1 index b301f69526..c99c1e369a 100644 --- a/tests/data/modrdn.out.master.1 +++ b/tests/data/modrdn.out.master.1 @@ -1,7 +1,5 @@ dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Michi gan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones diff --git a/tests/data/modrdn.out.master.2 b/tests/data/modrdn.out.master.2 index ba92ce0952..61dd866822 100644 --- a/tests/data/modrdn.out.master.2 +++ b/tests/data/modrdn.out.master.2 @@ -1,7 +1,5 @@ dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univers ity of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James Jones cn: Jim Jones diff --git a/tests/data/modrdn.out.master.3 b/tests/data/modrdn.out.master.3 index f9bff68b41..7b8474b8d3 100644 --- a/tests/data/modrdn.out.master.3 +++ b/tests/data/modrdn.out.master.3 @@ -1,7 +1,5 @@ dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones diff --git a/tests/data/passwd.ldif b/tests/data/passwd.ldif index 221af87ea2..a8768b095f 100644 --- a/tests/data/passwd.ldif +++ b/tests/data/passwd.ldif @@ -1,31 +1,26 @@ dn: o=University of Michigan,c=US -objectclass: top objectclass: organization o: University of Michigan dn: cn=md5,o=University of Michigan,c=US -objectclass: top objectclass: person cn: md5 sn: md5 userpassword:: e01ENX1YcjRpbE96UTRQQ09xM2FRMHFidWFRPT0= dn: cn=smd5,o=University of Michigan,c=US -objectclass: top objectclass: person cn: smd5 sn: smd5 userpassword: secret dn: cn=sha,o=University of Michigan,c=US -objectclass: top objectclass: person cn: sha sn: sha userpassword:: e1NIQX01ZW42RzZNZXpScm9UM1hLcWtkUE9tWS9CZlE9 dn: cn=ssha,o=University of Michigan,c=US -objectclass: top objectclass: person cn: ssha sn: ssha diff --git a/tests/data/search.out.master b/tests/data/search.out.master index d753a73893..3205316b1f 100644 --- a/tests/data/search.out.master +++ b/tests/data/search.out.master @@ -1,7 +1,5 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen @@ -23,8 +21,6 @@ telephonenumber: +1 313 555 9022 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen @@ -104,8 +100,6 @@ member: cn=John Doe,ou=Information Technology Division,ou=People,o=University dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -217,17 +211,14 @@ cn: Alumni Assoc Staff objectclass: groupofnames dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Alumni Association dn: ou=Groups,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Groups dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Information Technology Division @@ -245,7 +236,6 @@ member: cn=John Doe,ou=Information Technology Division,ou=People,o=University of Michigan,c=US dn: cn=Manager,o=University of Michigan,c=US -objectClass: top objectClass: person cn: Manager cn: Directory Manager @@ -255,12 +245,10 @@ description: Manager of the directory userPassword:: c2VjcmV0 dn: ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: People dn: o=University of Michigan,c=US -objectclass: top objectclass: organization objectclass: domainRelatedObject l: Ann Arbor, Michigan diff --git a/tests/data/test-glued.ldif b/tests/data/test-glued.ldif index 90554b6d6c..17dd4f7949 100644 --- a/tests/data/test-glued.ldif +++ b/tests/data/test-glued.ldif @@ -1,5 +1,4 @@ dn: o=University of Michigan,c=US -objectClass: top objectClass: organization objectClass: domainRelatedObject l: Ann Arbor, Michigan @@ -16,19 +15,15 @@ telephoneNumber: +1 313 764-1817 associatedDomain: umich.edu dn: ou=People,o=University of Michigan,c=US -objectClass: top objectClass: organizationalUnit ou: People dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectClass: top objectClass: organizationalUnit ou: Alumni Association dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens @@ -47,8 +42,6 @@ homePhone: +1 313 555 0454 dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -68,8 +61,6 @@ facsimileTelephoneNumber: +1 313 555 4332 telephoneNumber: +1 313 555 0895 dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson @@ -89,8 +80,6 @@ telephoneNumber: +1 313 555 4774 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan ,c=US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: Jennifer Smith cn: Jen Smith @@ -108,7 +97,6 @@ facsimileTelephoneNumber: +1 313 555 2756 telephoneNumber: +1 313 555 8232 dn: cn=Manager,o=University of Michigan,c=US -objectClass: top objectClass: person cn: Manager cn: Directory Manager @@ -119,8 +107,6 @@ userPassword:: c2VjcmV0 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: Mark Elliot cn: Mark A Elliot @@ -139,8 +125,6 @@ telephoneNumber: +1 313 555 4177 dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: Ursula Hampster sn: Hampster @@ -156,14 +140,11 @@ facsimileTelephoneNumber: +1 313 555 9700 telephoneNumber: +1 313 555 5331 dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectClass: top objectClass: organizationalUnit ou: Information Technology Division dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen @@ -185,8 +166,6 @@ telephoneNumber: +1 313 555 9022 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen @@ -207,8 +186,6 @@ telephoneNumber: +1 313 555 0355 dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Universi ty of Michigan,c=US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: James A Jones 2 cn: James Jones @@ -228,8 +205,6 @@ telephoneNumber: +1 313 555 7334 dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M ichigan,c=US -objectClass: top -objectClass: person objectClass: OpenLDAPperson cn: John Doe cn: Jonathon Doe @@ -247,7 +222,6 @@ facsimileTelephoneNumber: +1 313 555 4544 telephoneNumber: +1 313 555 9394 dn: ou=Groups,o=University of Michigan,c=US -objectClass: top objectClass: organizationalUnit ou: Groups diff --git a/tests/data/test-lang.ldif b/tests/data/test-lang.ldif index ffb989af25..f108b06949 100644 --- a/tests/data/test-lang.ldif +++ b/tests/data/test-lang.ldif @@ -1,5 +1,4 @@ dn: o=University of Michigan,c=US -objectClass: top objectClass: organization objectClass: extensibleObject o: University of Michigan diff --git a/tests/data/test-ordered.ldif b/tests/data/test-ordered.ldif index 09c8723e20..f3ad43563d 100644 --- a/tests/data/test-ordered.ldif +++ b/tests/data/test-ordered.ldif @@ -1,5 +1,4 @@ dn: o=University of Michigan,c=US -objectclass: top objectclass: organization objectclass: domainRelatedObject l: Ann Arbor, Michigan @@ -16,23 +15,19 @@ telephonenumber: +1 313 764-1817 associateddomain: umich.edu dn: ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: People dn: ou=Groups,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Groups dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Alumni Association dn: ou=Information Technology Division,ou=People,o=University of Michigan,c =US -objectclass: top objectclass: organizationalUnit ou: Information Technology Division @@ -84,8 +79,6 @@ objectclass: groupofnames dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Univer sity of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen @@ -107,8 +100,6 @@ telephonenumber: +1 313 555 9022 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Universi ty of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen @@ -129,8 +120,6 @@ telephonenumber: +1 313 555 0355 dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mich igan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens @@ -162,8 +151,6 @@ member: cn=John Doe,ou=Information Technology Division,ou=People,o=University dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mich igan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -184,8 +171,6 @@ telephonenumber: +1 313 555 0895 dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Unive rsity of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 2 cn: James Jones @@ -205,8 +190,6 @@ telephonenumber: +1 313 555 7334 dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c =US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson @@ -226,8 +209,6 @@ telephonenumber: +1 313 555 4774 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michi gan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jennifer Smith cn: Jen Smith @@ -246,8 +227,6 @@ telephonenumber: +1 313 555 8232 dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University o f Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: John Doe cn: Jonathon Doe @@ -265,7 +244,6 @@ facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 dn: cn=Manager,o=University of Michigan,c=US -objectclass: top objectclass: person cn: Manager cn: Directory Manager @@ -276,8 +254,6 @@ userpassword:: c2VjcmV0 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan ,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Mark Elliot cn: Mark A Elliot @@ -296,8 +272,6 @@ telephonenumber: +1 313 555 4177 dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich igan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Ursula Hampster sn: Hampster diff --git a/tests/data/test.ldif b/tests/data/test.ldif index 6478a1620b..752883585a 100644 --- a/tests/data/test.ldif +++ b/tests/data/test.ldif @@ -45,14 +45,11 @@ cn: Alumni Assoc Staff objectclass: groupofnames dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Alumni Association dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit y of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen @@ -74,8 +71,6 @@ telephonenumber: +1 313 555 9022 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen @@ -96,8 +91,6 @@ telephonenumber: +1 313 555 0355 dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Dorothy Stevens cn: Dot Stevens @@ -115,12 +108,10 @@ mail: dots@mail.alumni.umich.edu homephone: +1 313 555 0454 dn: ou=Groups,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Groups dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: Information Technology Division @@ -139,8 +130,6 @@ member: cn=John Doe,ou=Information Technology Division,ou=People,o=University dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -161,8 +150,6 @@ telephonenumber: +1 313 555 0895 dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Universi ty of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: James A Jones 2 cn: James Jones @@ -181,8 +168,6 @@ facsimiletelephonenumber: +1 313 555 8688 telephonenumber: +1 313 555 7334 dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jane Doe cn: Jane Alverson @@ -202,8 +187,6 @@ telephonenumber: +1 313 555 4774 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan ,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Jennifer Smith cn: Jen Smith @@ -222,8 +205,6 @@ telephonenumber: +1 313 555 8232 dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M ichigan,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: John Doe cn: Jonathon Doe @@ -241,7 +222,6 @@ facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 dn: cn=Manager,o=University of Michigan,c=US -objectclass: top objectclass: person cn: Manager cn: Directory Manager @@ -252,8 +232,6 @@ userpassword:: c2VjcmV0 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Mark Elliot cn: Mark A Elliot @@ -271,12 +249,10 @@ facsimiletelephonenumber: +1 313 555 7762 telephonenumber: +1 313 555 4177 dn: ou=People,o=University of Michigan,c=US -objectclass: top objectclass: organizationalUnit ou: People dn: o=University of Michigan,c=US -objectclass: top objectclass: organization objectclass: domainRelatedObject l: Ann Arbor, Michigan @@ -294,8 +270,6 @@ associateddomain: umich.edu dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga n,c=US -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Ursula Hampster sn: Hampster diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index d5571ae3a4..fa7d25bbd1 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -104,8 +104,6 @@ member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michi dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US changetype: add -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Gern Jensen sn: Jensen diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication index e3eaab27bd..dd828dd386 100755 --- a/tests/scripts/test007-replication +++ b/tests/scripts/test007-replication @@ -134,8 +134,6 @@ delete: member dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US changetype: add -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Gern Jensen sn: Jensen @@ -153,14 +151,12 @@ homephone: +1 313 555 8844 dn: ou=Retired, ou=People, o=University of Michigan, c=US changetype: add -objectclass: top objectclass: organizationalUnit ou: Retired dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US changetype: add -objectclass: top -objectclass: person +objectclass: OpenLDAPperson cn: Rosco P. Coltrane sn: Coltrane diff --git a/tests/scripts/test011-subtree-repl b/tests/scripts/test011-subtree-repl index 9957160c01..0f2e688cd8 100755 --- a/tests/scripts/test011-subtree-repl +++ b/tests/scripts/test011-subtree-repl @@ -139,8 +139,6 @@ delete: member dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US changetype: add -objectclass: top -objectclass: person objectclass: OpenLDAPperson cn: Gern Jensen sn: Jensen @@ -158,14 +156,12 @@ homephone: +1 313 555 8844 dn: ou=Retired, ou=People, o=University of Michigan, c=US changetype: add -objectclass: top objectclass: organizationalUnit ou: Retired dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US changetype: add -objectclass: top -objectclass: person +objectclass: OpenLDAPperson cn: Rosco P. Coltrane sn: Coltrane