Remove abandon cruft

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

diff --git a/tests/data/modify.out.master b/tests/data/modify.out.master
index ec9f01c5a1b82e2c1b426edf6f0a91ff8c343de3..023892e496aedfc238adfb2bf54b8804a45a1485 100644 (file)
--- a/tests/data/modify.out.master
+++ b/tests/data/modify.out.master
@@ -1,26 +1,26 @@
 dn: cn=All 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
 cn: All Staff
 description: Everyone in the sample data
 objectclass: groupofnames
-member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of 
- Michigan, c=US
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mic
+ higan,c=US
 
 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
@@ -34,15 +34,15 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit
  y 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
@@ -57,12 +57,12 @@ dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University
  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
 title: Director, Embedded Systems
@@ -80,14 +80,14 @@ dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga
  n,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
@@ -100,13 +100,13 @@ dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,o=University o
  f Michigan,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: Gern Jensen
 sn: Jensen
+uid: gjensen
 title: Chief Investigator, ITD
 postaladdress: ITD $ 535 W. William St $ Ann Arbor, MI 48103
-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: Coffee
 homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104
 description: Very odd
@@ -126,30 +126,30 @@ 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=John Doe, ou=Information Technology Division, ou=People, o=Universi
- ty 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=Manager,o=University of Michigan,c=US
+member: cn=John Doe,ou=Information Technology Division,ou=People,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
 
 dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga
  n,c=US
 objectclass: top
 objectclass: person
-objectclass: organizationalPerson
-objectclass: newPilotPerson
+objectclass: OpenLDAPperson
 cn: James A Jones 1
 cn: James Jones
 cn: Jim Jones
 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
@@ -164,14 +164,14 @@ drink: Orange Juice
 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
@@ -185,13 +185,13 @@ dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan
  ,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
@@ -205,13 +205,13 @@ dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M
  ichigan,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!
@@ -235,13 +235,13 @@ dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,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
@@ -277,13 +277,13 @@ dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga
  n,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