Remove abandon cruft

[openldap] / tests / data / modrdn.out.master

diff --git a/tests/data/modrdn.out.master b/tests/data/modrdn.out.master
index e356746980ec1da7f7fa2d3c63078ef5ffadb64c..53e4ef8728c58b6c447a0e7a5d0d76104300626a 100644 (file)
--- a/tests/data/modrdn.out.master
+++ b/tests/data/modrdn.out.master
@@ -1,45 +1,45 @@
 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
- iversity of Michigan, c=US
-member: cn=Jane Doe, ou=Alumni Association, ou=People, o=University of Michiga
- n, c=US
-member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi
- ty of Michigan, c=US
-member: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Mich
- igan, c=US
-member: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of 
- Michigan, c=US
-member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U
- niversity of Michigan, c=US
-member: cn=Jennifer Smith, ou=Alumni Association, ou=People, o=University of M
- ichigan, c=US
-member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of 
- Michigan, c=US
-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
-owner: cn=Manager, 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=Unive
+ rsity of Michigan,c=US
+member: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c
+ =US
+member: cn=John Doe,ou=Information Technology Division,ou=People,o=University 
+ of Michigan,c=US
+member: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michiga
+ n,c=US
+member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mic
+ higan,c=US
+member: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Univ
+ ersity of Michigan,c=US
+member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Mich
+ igan,c=US
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mic
+ higan,c=US
+member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mic
+ higan,c=US
+member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Univers
+ ity of Michigan,c=US
+owner: cn=Manager,o=University of Michigan,c=US
 cn: All Staff
 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
-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
-member: cn=Jane Doe, ou=Alumni Association, ou=People, o=University of Michiga
- n, c=US
-member: cn=Jennifer Smith, ou=Alumni Association, ou=People, o=University of M
- ichigan, c=US
-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
-owner: cn=Manager, o=University of Michigan, c=US
+member: cn=Manager,o=University of Michigan,c=US
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mic
+ higan,c=US
+member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mic
+ higan,c=US
+member: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c
+ =US
+member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Mich
+ igan,c=US
+member: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michiga
+ n,c=US
+member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mic
+ higan,c=US
+owner: cn=Manager,o=University of Michigan,c=US
 description: All Alumni Assoc Staff
 cn: Alumni Assoc Staff
 objectclass: groupofnames
@@ -53,15 +53,15 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Univer
  sity of Michigan,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: Barbara Jensen
 cn: Babs Jensen
 sn: Jensen
+uid: bjensen
 title: Mythical Manager, Research Systems
 postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Ann 
  Arbor, MI 48103-4943
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 userpassword:: YmplbnNlbg==
 mail: bjensen@mailgw.umich.edu
 homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103
@@ -76,12 +76,12 @@ dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Universi
  ty of Michigan,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: Bjorn Jensen
 cn: Biiff Jensen
 sn: Jensen
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+uid: bjorn
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 userpassword:: Ympvcm4=
 homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999
 drink: Iced Tea
@@ -98,14 +98,14 @@ dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mich
  igan,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: Dorothy Stevens
 cn: Dot Stevens
 sn: Stevens
+uid: dots
 title: Secretary, UM Alumni Association
 postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 drink: Lemonade
 homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104
 description: Very tall
@@ -126,29 +126,29 @@ objectclass: organizationalUnit
 ou: Information Technology Division
 
 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
-owner: cn=Manager, o=University of Michigan, c=US
+owner: cn=Manager,o=University of Michigan,c=US
 description: All ITD Staff
 cn: ITD Staff
 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
-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
+member: cn=Manager,o=University of Michigan,c=US
+member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Univers
+ ity of Michigan,c=US
+member: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Univ
+ ersity of Michigan,c=US
+member: cn=John Doe,ou=Information Technology Division,ou=People,o=University 
+ of Michigan,c=US
 
 dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univ
- ersity of Michigan, c=US
+ ersity of Michigan,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: James Jones
 cn: Jim Jones
 cn: James A Jones II
 sn: Doe
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+uid: jjones
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104
 homephone: +1 313 555 8838
 title: Senior Manager, Information Technology Division
@@ -160,18 +160,18 @@ facsimiletelephonenumber: +1 313 555 8688
 telephonenumber: +1 313 555 7334
 
 dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Mi
- chigan, c=US
+ chigan,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: James A Jones 1
 cn: James Jones
 cn: Jim Jones
 cn: James A Jones III
 sn: Jones
+uid: jaj
 postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 userpassword:: amFq
 homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105
 homephone: +1 313 555 4772
@@ -186,14 +186,14 @@ dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c
  =US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: Jane Doe
 cn: Jane Alverson
 sn: Doe
+uid: jdoe
 title: Programmer Analyst, UM Alumni Association
 postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104
 drink: diet coke
 description: Enthusiastic
@@ -204,16 +204,16 @@ facsimiletelephonenumber: +1 313 555 2311
 telephonenumber: +1 313 555 4774
 
 dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michi
- gan, c=US
+ gan,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: Jennifer Smith
 cn: Jen Smith
 sn: Smith
+uid: jen
 postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 drink: Sam Adams
 homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103
 title: Telemarketer, UM Alumni Association
@@ -224,16 +224,16 @@ facsimiletelephonenumber: +1 313 555 2756
 telephonenumber: +1 313 555 8232
 
 dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University o
- f Michigan, c=US
+ f Michigan,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: John Doe
 cn: Jonathon Doe
 sn: Doe
+uid: johnd
 postaladdress: ITD $ 535 W. William $ Ann Arbor, MI 48109
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104
 title: System Administrator, Information Technology Division
 description: overworked!
@@ -254,16 +254,16 @@ description: Manager of the directory
 userpassword:: c2VjcmV0
 
 dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan
- , c=US
+ ,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: Mark Elliot
 cn: Mark A Elliot
 sn: Elliot
+uid: melliot
 postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198
 homephone: +1 313 555 0388
 drink: Gasoline
@@ -296,16 +296,16 @@ telephonenumber: +1 313 764-1817
 associateddomain: umich.edu
 
 dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich
- igan, c=US
+ igan,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: Ursula Hampster
 sn: Hampster
+uid: uham
 title: Secretary, UM Alumni Association
 postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109
-seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US
+seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104
 mail: uham@mail.alumni.umich.edu
 homephone: +1 313 555 8421