From: Kurt Zeilenga Date: Tue, 23 May 2000 21:36:44 +0000 (+0000) Subject: Remove dependency upon umichPilotPerson (use just newPilotPerson) X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2888 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3bb1b752c6f6edf227da3d664258114177e5603f;p=openldap Remove dependency upon umichPilotPerson (use just newPilotPerson) --- diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master index 3c8e799f81..a199068b81 100644 --- a/tests/data/acl.out.master +++ b/tests/data/acl.out.master @@ -4,20 +4,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 1 cn: James Jones cn: Jim Jones sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu @@ -80,7 +75,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Barbara Jensen cn: Babs Jensen sn: Jensen @@ -88,15 +82,9 @@ 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 -uid: bjensen mail: bjensen@mailgw.umich.edu homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 -krbname: bjensen@umich.edu -multilinedescription: Mythical manager of the rsdd unix project -nobatchupdates: TRUE -notice: Off sailing this month. -onvacation: FALSE -labeledurl: http://www.umich.edu/ U-M Home Page +description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 pager: +1 313 555 3233 @@ -109,18 +97,13 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: bjorn -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea -multilinedescription: Hiker, biker +description: Hiker, biker title: Director, Embedded Systems postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 mail: bjorn@mailgw.umich.edu @@ -162,20 +145,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jjones -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division -multilinedescription: Not around very much +description: Not around very much mail: jjones@mailgw.umich.edu postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 pager: +1 313 555 2833 @@ -188,19 +166,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: John Doe cn: Jonathon Doe sn: Doe postaladdress: ITD $ 535 W. William $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: johnd -krbname: johnd@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 title: System Administrator, Information Technology Division -multilinedescription: overworked! +description: overworked! mail: johnd@mailgw.umich.edu homephone: +1 313 555 3774 pager: +1 313 555 6573 @@ -210,13 +183,11 @@ telephonenumber: +1 313 555 9394 dn: cn=Manager, o=University of Michigan, c=US objectclass: top objectclass: person -objectclass: kerberosSecurityObject cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory -krbname: bjensen@umich.edu dn: ou=People, o=University of Michigan, c=US objectclass: top diff --git a/tests/data/do_add.1 b/tests/data/do_add.1 index d5c58ef83f..01196d8360 100644 --- a/tests/data/do_add.1 +++ b/tests/data/do_add.1 @@ -3,21 +3,16 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu userpassword:: amFq -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu diff --git a/tests/data/modify.out.master b/tests/data/modify.out.master index 0f88c67e15..25fab50ad7 100644 --- a/tests/data/modify.out.master +++ b/tests/data/modify.out.master @@ -36,7 +36,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Barbara Jensen cn: Babs Jensen sn: Jensen @@ -44,16 +43,10 @@ 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 -uid: bjensen userpassword:: YmplbnNlbg== mail: bjensen@mailgw.umich.edu homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 -krbname: bjensen@umich.edu -multilinedescription: Mythical manager of the rsdd unix project -nobatchupdates: TRUE -notice: Off sailing this month. -onvacation: FALSE -labeledurl: http://www.umich.edu/ U-M Home Page +description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 pager: +1 313 555 3233 @@ -66,16 +59,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: bjorn userpassword:: Ympvcm4= -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 title: Director, Embedded Systems postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 @@ -84,7 +72,7 @@ homephone: +1 313 555 5444 pager: +1 313 555 4474 facsimiletelephonenumber: +1 313 555 2177 telephonenumber: +1 313 555 0355 -multilinedescription: The replaced multiLineDescription $ Blah Woof. +description: The replaced multiLineDescription $ Blah Woof. drink: Iced Tea drink: Mad Dog 20/20 @@ -94,20 +82,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Dorothy Stevens cn: Dot Stevens sn: Stevens 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 -uid: dots -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Lemonade homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 -multilinedescription: Very tall +description: Very tall facsimiletelephonenumber: +1 313 555 3223 telephonenumber: +1 313 555 3664 mail: dots@mail.alumni.umich.edu @@ -119,18 +102,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Gern Jensen +sn: Jensen 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 -uid: gjensen -krbname: gjensen@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Coffee homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 -multilinedescription: Very odd +description: Very odd facsimiletelephonenumber: +1 313 555 7557 telephonenumber: +1 313 555 8343 mail: gjensen@mailgw.umich.edu @@ -166,21 +145,16 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 1 cn: James Jones cn: Jim Jones sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu userpassword:: amFq -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu @@ -194,20 +168,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jane Doe cn: Jane Alverson sn: Doe 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 -uid: jdoe homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: diet coke -multilinedescription: Enthusiastic +description: Enthusiastic mail: jdoe@woof.net homephone: +1 313 555 5445 pager: +1 313 555 1220 @@ -220,16 +189,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jennifer Smith cn: Jen Smith sn: Smith postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jen -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Sam Adams homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 title: Telemarketer, UM Alumni Association @@ -245,19 +209,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: John Doe cn: Jonathon Doe sn: Doe postaladdress: ITD $ 535 W. William $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: johnd -krbname: johnd@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 title: System Administrator, Information Technology Division -multilinedescription: overworked! +description: overworked! mail: johnd@mailgw.umich.edu homephone: +1 313 555 3774 pager: +1 313 555 6573 @@ -267,14 +226,12 @@ telephonenumber: +1 313 555 9394 dn: cn=Manager, o=University of Michigan, c=US objectclass: top objectclass: person -objectclass: kerberosSecurityObject cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory userpassword:: c2VjcmV0 -krbname: bjensen@umich.edu dn: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Michigan , c=US @@ -282,16 +239,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Mark Elliot cn: Mark A Elliot sn: Elliot postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: melliot -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 homephone: +1 313 555 0388 drink: Gasoline @@ -330,17 +282,12 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Ursula Hampster sn: Hampster 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 -uid: uham homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE mail: uham@mail.alumni.umich.edu homephone: +1 313 555 8421 pager: +1 313 555 2844 diff --git a/tests/data/modrdn.out.master b/tests/data/modrdn.out.master index 643ffc5b48..d237d793e4 100644 --- a/tests/data/modrdn.out.master +++ b/tests/data/modrdn.out.master @@ -55,7 +55,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Barbara Jensen cn: Babs Jensen sn: Jensen @@ -63,16 +62,10 @@ 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 -uid: bjensen userpassword:: YmplbnNlbg== mail: bjensen@mailgw.umich.edu homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 -krbname: bjensen@umich.edu -multilinedescription: Mythical manager of the rsdd unix project -nobatchupdates: TRUE -notice: Off sailing this month. -onvacation: FALSE -labeledurl: http://www.umich.edu/ U-M Home Page +description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 pager: +1 313 555 3233 @@ -85,19 +78,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: bjorn userpassword:: Ympvcm4= -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea -multilinedescription: Hiker, biker +description: Hiker, biker title: Director, Embedded Systems postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 mail: bjorn@mailgw.umich.edu @@ -112,20 +100,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Dorothy Stevens cn: Dot Stevens sn: Stevens 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 -uid: dots -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Lemonade homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 -multilinedescription: Very tall +description: Very tall facsimiletelephonenumber: +1 313 555 3223 telephonenumber: +1 313 555 3664 mail: dots@mail.alumni.umich.edu @@ -161,20 +144,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson 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 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division -multilinedescription: Not around very much +description: Not around very much mail: jjones@mailgw.umich.edu postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 pager: +1 313 555 2833 @@ -187,7 +165,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 1 cn: James Jones cn: Jim Jones @@ -195,14 +172,10 @@ cn: James A Jones III sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu userpassword:: amFq -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu @@ -215,20 +188,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jane Doe cn: Jane Alverson sn: Doe 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 -uid: jdoe homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: diet coke -multilinedescription: Enthusiastic +description: Enthusiastic mail: jdoe@woof.net homephone: +1 313 555 5445 pager: +1 313 555 1220 @@ -241,16 +209,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jennifer Smith cn: Jen Smith sn: Smith postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jen -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Sam Adams homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 title: Telemarketer, UM Alumni Association @@ -266,19 +229,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: John Doe cn: Jonathon Doe sn: Doe postaladdress: ITD $ 535 W. William $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: johnd -krbname: johnd@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 title: System Administrator, Information Technology Division -multilinedescription: overworked! +description: overworked! mail: johnd@mailgw.umich.edu homephone: +1 313 555 3774 pager: +1 313 555 6573 @@ -288,14 +246,12 @@ telephonenumber: +1 313 555 9394 dn: cn=Manager, o=University of Michigan, c=US objectclass: top objectclass: person -objectclass: kerberosSecurityObject cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory userpassword:: c2VjcmV0 -krbname: bjensen@umich.edu dn: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Michigan , c=US @@ -303,16 +259,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Mark Elliot cn: Mark A Elliot sn: Elliot postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: melliot -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 homephone: +1 313 555 0388 drink: Gasoline @@ -351,17 +302,12 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Ursula Hampster sn: Hampster 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 -uid: uham homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE mail: uham@mail.alumni.umich.edu homephone: +1 313 555 8421 pager: +1 313 555 2844 diff --git a/tests/data/modrdn.out.master.0 b/tests/data/modrdn.out.master.0 index 643ffc5b48..d237d793e4 100644 --- a/tests/data/modrdn.out.master.0 +++ b/tests/data/modrdn.out.master.0 @@ -55,7 +55,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Barbara Jensen cn: Babs Jensen sn: Jensen @@ -63,16 +62,10 @@ 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 -uid: bjensen userpassword:: YmplbnNlbg== mail: bjensen@mailgw.umich.edu homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 -krbname: bjensen@umich.edu -multilinedescription: Mythical manager of the rsdd unix project -nobatchupdates: TRUE -notice: Off sailing this month. -onvacation: FALSE -labeledurl: http://www.umich.edu/ U-M Home Page +description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 pager: +1 313 555 3233 @@ -85,19 +78,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: bjorn userpassword:: Ympvcm4= -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea -multilinedescription: Hiker, biker +description: Hiker, biker title: Director, Embedded Systems postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 mail: bjorn@mailgw.umich.edu @@ -112,20 +100,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Dorothy Stevens cn: Dot Stevens sn: Stevens 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 -uid: dots -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Lemonade homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 -multilinedescription: Very tall +description: Very tall facsimiletelephonenumber: +1 313 555 3223 telephonenumber: +1 313 555 3664 mail: dots@mail.alumni.umich.edu @@ -161,20 +144,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson 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 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division -multilinedescription: Not around very much +description: Not around very much mail: jjones@mailgw.umich.edu postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 pager: +1 313 555 2833 @@ -187,7 +165,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 1 cn: James Jones cn: Jim Jones @@ -195,14 +172,10 @@ cn: James A Jones III sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu userpassword:: amFq -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu @@ -215,20 +188,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jane Doe cn: Jane Alverson sn: Doe 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 -uid: jdoe homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: diet coke -multilinedescription: Enthusiastic +description: Enthusiastic mail: jdoe@woof.net homephone: +1 313 555 5445 pager: +1 313 555 1220 @@ -241,16 +209,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jennifer Smith cn: Jen Smith sn: Smith postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jen -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Sam Adams homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 title: Telemarketer, UM Alumni Association @@ -266,19 +229,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: John Doe cn: Jonathon Doe sn: Doe postaladdress: ITD $ 535 W. William $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: johnd -krbname: johnd@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 title: System Administrator, Information Technology Division -multilinedescription: overworked! +description: overworked! mail: johnd@mailgw.umich.edu homephone: +1 313 555 3774 pager: +1 313 555 6573 @@ -288,14 +246,12 @@ telephonenumber: +1 313 555 9394 dn: cn=Manager, o=University of Michigan, c=US objectclass: top objectclass: person -objectclass: kerberosSecurityObject cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory userpassword:: c2VjcmV0 -krbname: bjensen@umich.edu dn: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Michigan , c=US @@ -303,16 +259,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Mark Elliot cn: Mark A Elliot sn: Elliot postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: melliot -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 homephone: +1 313 555 0388 drink: Gasoline @@ -351,17 +302,12 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Ursula Hampster sn: Hampster 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 -uid: uham homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE mail: uham@mail.alumni.umich.edu homephone: +1 313 555 8421 pager: +1 313 555 2844 diff --git a/tests/data/modrdn.out.master.1 b/tests/data/modrdn.out.master.1 index c3b1782d6f..dfd8633d28 100644 --- a/tests/data/modrdn.out.master.1 +++ b/tests/data/modrdn.out.master.1 @@ -4,7 +4,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 1 cn: James Jones cn: Jim Jones @@ -12,14 +11,10 @@ cn: James A Jones III sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu userpassword:: amFq -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu diff --git a/tests/data/modrdn.out.master.2 b/tests/data/modrdn.out.master.2 index 0ab798fcc5..65279ea171 100644 --- a/tests/data/modrdn.out.master.2 +++ b/tests/data/modrdn.out.master.2 @@ -4,20 +4,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson 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 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division -multilinedescription: Not around very much +description: Not around very much mail: jjones@mailgw.umich.edu postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 pager: +1 313 555 2833 diff --git a/tests/data/modrdn.out.master.3 b/tests/data/modrdn.out.master.3 index f3aa8cf5d2..0345196c24 100644 --- a/tests/data/modrdn.out.master.3 +++ b/tests/data/modrdn.out.master.3 @@ -4,21 +4,16 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 1 cn: James Jones cn: Jim Jones sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu userpassword:: amFq -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu diff --git a/tests/data/search.out.master b/tests/data/search.out.master index 025d252ece..7c284b576a 100644 --- a/tests/data/search.out.master +++ b/tests/data/search.out.master @@ -4,7 +4,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Barbara Jensen cn: Babs Jensen sn: Jensen @@ -12,16 +11,10 @@ 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 -uid: bjensen userpassword:: YmplbnNlbg== mail: bjensen@mailgw.umich.edu homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 -krbname: bjensen@umich.edu -multilinedescription: Mythical manager of the rsdd unix project -nobatchupdates: TRUE -notice: Off sailing this month. -onvacation: FALSE -labeledurl: http://www.umich.edu/ U-M Home Page +description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 pager: +1 313 555 3233 @@ -34,19 +27,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: bjorn userpassword:: Ympvcm4= -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea -multilinedescription: Hiker, biker +description: Hiker, biker title: Director, Embedded Systems postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 mail: bjorn@mailgw.umich.edu @@ -119,21 +107,16 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 1 cn: James Jones cn: Jim Jones sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu userpassword:: amFq -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf index e9facfe8dc..3090326939 100644 --- a/tests/data/slapd-master.conf +++ b/tests/data/slapd-master.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/slapd.at.conf b/tests/data/slapd.at.conf index 0191d2b652..1467748247 100644 --- a/tests/data/slapd.at.conf +++ b/tests/data/slapd.at.conf @@ -5,7 +5,7 @@ attribute jpegphoto bin attribute audio bin attribute labeledurl ces attribute ref ces -attribute userpassword ces +attribute userpassword bin attribute telephonenumber tel attribute facsimiletelephonenumber fax tel attribute pagertelephonenumber pager tel diff --git a/tests/data/slapd.oc.conf b/tests/data/slapd.oc.conf index fc63fa4fc8..420182dfb2 100644 --- a/tests/data/slapd.oc.conf +++ b/tests/data/slapd.oc.conf @@ -4,6 +4,10 @@ objectclass top requires objectClass +objectclass ldapsubentry + requires + objectclass + objectclass alias requires aliasedObjectName, @@ -14,6 +18,16 @@ objectclass referral ref, objectClass +objectclass dcobject + requires + objectClass, + dc + +objectclass uidobject + requires + objectClass, + uid + objectclass country requires objectClass, @@ -90,17 +104,18 @@ objectclass organizationalUnit objectclass person requires objectClass, + sn, cn allows description, seeAlso, - sn, telephoneNumber, userPassword objectclass organizationalPerson requires objectClass, + sn, cn allows description, @@ -116,7 +131,6 @@ objectclass organizationalPerson preferredDeliveryMethod, registeredAddress, seeAlso, - sn, st, streetAddress, telephoneNumber, @@ -168,6 +182,7 @@ objectclass groupOfNames objectclass residentialPerson requires objectClass, + sn, cn, l allows @@ -184,7 +199,6 @@ objectclass residentialPerson preferredDeliveryMethod, registeredAddress, seeAlso, - sn, st, streetAddress, telephoneNumber, @@ -268,6 +282,7 @@ objectclass pilotObject objectclass newPilotPerson requires objectClass, + sn, cn allows businessCategory, @@ -276,8 +291,6 @@ objectclass newPilotPerson homePhone, homePostalAddress, janetMailbox, - lastModifiedBy, - lastModifiedTime, mail, mailPreferenceOption, mobile, @@ -290,7 +303,6 @@ objectclass newPilotPerson roomNumber, secretary, seeAlso, - sn, telephoneNumber, textEncodedORaddress, uid, @@ -669,10 +681,40 @@ objectclass kerberosSecurityObject objectClass, krbName +objectclass inetOrgPerson + requires + objectClass, + cn, + sn + allows + description, + destinationIndicator, + facsimileTelephoneNumber, + internationaliSDNNumber, + l, + ou, + physicalDeliveryOfficeName, + postalAddress, + postalCode, + postOfficeBox, + preferredDeliveryMethod, + registeredAddress, + seeAlso, + st, + street, + telephoneNumber, + teletexTerminalIdentifier, + telexNumber, + title, + userPassword, + x121Address + objectclass umichPerson requires objectClass, - cn + sn, + cn, + universityID allows affiliationCode, audio, @@ -721,7 +763,6 @@ objectclass umichPerson roomNumber, secretary, seeAlso, - sn, st, streetAddress, telephoneNumber, @@ -730,7 +771,6 @@ objectclass umichPerson textEncodedORaddress, title, uid, - universityID, updateSource, userCertificate, userClass, diff --git a/tests/data/test-ordered.ldif b/tests/data/test-ordered.ldif index 03c19b5664..cb17adf892 100644 --- a/tests/data/test-ordered.ldif +++ b/tests/data/test-ordered.ldif @@ -89,7 +89,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Barbara Jensen cn: Babs Jensen sn: Jensen @@ -97,16 +96,10 @@ 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 -uid: bjensen userpassword:: YmplbnNlbg== mail: bjensen@mailgw.umich.edu homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 -krbname: bjensen@umich.edu -multilinedescription: Mythical manager of the rsdd unix project -nobatchupdates: TRUE -notice: Off sailing this month. -onvacation: FALSE -labeledurl: http://www.umich.edu/ U-M Home Page +description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 pager: +1 313 555 3233 @@ -119,19 +112,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: bjorn userpassword:: Ympvcm4= -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea -multilinedescription: Hiker, biker +description: Hiker, biker title: Director, Embedded Systems postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 mail: bjorn@mailgw.umich.edu @@ -146,20 +134,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Dorothy Stevens cn: Dot Stevens sn: Stevens 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 -uid: dots -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Lemonade homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 -multilinedescription: Very tall +description: Very tall facsimiletelephonenumber: +1 313 555 3223 telephonenumber: +1 313 555 3664 mail: dots@mail.alumni.umich.edu @@ -184,21 +167,16 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 1 cn: James Jones cn: Jim Jones sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu userpassword:: amFq -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu @@ -211,20 +189,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jjones -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division -multilinedescription: Not around very much +description: Not around very much mail: jjones@mailgw.umich.edu postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 pager: +1 313 555 2833 @@ -237,20 +210,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jane Doe cn: Jane Alverson sn: Doe 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 -uid: jdoe homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: diet coke -multilinedescription: Enthusiastic +description: Enthusiastic mail: jdoe@woof.net homephone: +1 313 555 5445 pager: +1 313 555 1220 @@ -263,16 +231,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jennifer Smith cn: Jen Smith sn: Smith postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jen -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Sam Adams homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 title: Telemarketer, UM Alumni Association @@ -288,19 +251,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: John Doe cn: Jonathon Doe sn: Doe postaladdress: ITD $ 535 W. William $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: johnd -krbname: johnd@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 title: System Administrator, Information Technology Division -multilinedescription: overworked! +description: overworked! mail: johnd@mailgw.umich.edu homephone: +1 313 555 3774 pager: +1 313 555 6573 @@ -310,14 +268,12 @@ telephonenumber: +1 313 555 9394 dn: cn=Manager, o=University of Michigan, c=US objectclass: top objectclass: person -objectclass: kerberosSecurityObject cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory userpassword:: c2VjcmV0 -krbname: bjensen@umich.edu dn: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Michigan , c=US @@ -325,16 +281,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Mark Elliot cn: Mark A Elliot sn: Elliot postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: melliot -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 homephone: +1 313 555 0388 drink: Gasoline @@ -350,17 +301,12 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Ursula Hampster sn: Hampster 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 -uid: uham homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE mail: uham@mail.alumni.umich.edu homephone: +1 313 555 8421 pager: +1 313 555 2844 diff --git a/tests/data/test.ldif b/tests/data/test.ldif index 07fcc1dc7b..9c1c697914 100644 --- a/tests/data/test.ldif +++ b/tests/data/test.ldif @@ -55,7 +55,6 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Barbara Jensen cn: Babs Jensen sn: Jensen @@ -63,16 +62,10 @@ 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 -uid: bjensen userpassword:: YmplbnNlbg== mail: bjensen@mailgw.umich.edu homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 -krbname: bjensen@umich.edu -multilinedescription: Mythical manager of the rsdd unix project -nobatchupdates: TRUE -notice: Off sailing this month. -onvacation: FALSE -labeledurl: http://www.umich.edu/ U-M Home Page +description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 pager: +1 313 555 3233 @@ -85,19 +78,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: bjorn userpassword:: Ympvcm4= -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea -multilinedescription: Hiker, biker +description: Hiker, biker title: Director, Embedded Systems postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 mail: bjorn@mailgw.umich.edu @@ -112,20 +100,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Dorothy Stevens cn: Dot Stevens sn: Stevens 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 -uid: dots -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Lemonade homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 -multilinedescription: Very tall +description: Very tall facsimiletelephonenumber: +1 313 555 3223 telephonenumber: +1 313 555 3664 mail: dots@mail.alumni.umich.edu @@ -161,21 +144,16 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 1 cn: James Jones cn: Jim Jones sn: Jones postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jaj -krbname: jaj@umich.edu userpassword:: amFq -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 homephone: +1 313 555 4772 -multilinedescription: Outstanding +description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.umich.edu @@ -188,20 +166,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jjones -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division -multilinedescription: Not around very much +description: Not around very much mail: jjones@mailgw.umich.edu postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 pager: +1 313 555 2833 @@ -214,20 +187,15 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jane Doe cn: Jane Alverson sn: Doe 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 -uid: jdoe homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: diet coke -multilinedescription: Enthusiastic +description: Enthusiastic mail: jdoe@woof.net homephone: +1 313 555 5445 pager: +1 313 555 1220 @@ -240,16 +208,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Jennifer Smith cn: Jen Smith sn: Smith postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: jen -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Sam Adams homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 title: Telemarketer, UM Alumni Association @@ -265,19 +228,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: John Doe cn: Jonathon Doe sn: Doe postaladdress: ITD $ 535 W. William $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: johnd -krbname: johnd@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 title: System Administrator, Information Technology Division -multilinedescription: overworked! +description: overworked! mail: johnd@mailgw.umich.edu homephone: +1 313 555 3774 pager: +1 313 555 6573 @@ -287,14 +245,12 @@ telephonenumber: +1 313 555 9394 dn: cn=Manager, o=University of Michigan, c=US objectclass: top objectclass: person -objectclass: kerberosSecurityObject cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory userpassword:: c2VjcmV0 -krbname: bjensen@umich.edu dn: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Michigan , c=US @@ -302,16 +258,11 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Mark Elliot cn: Mark A Elliot sn: Elliot postaladdress: Alumni Association $ 111 Maple St $ Ann Arbor, MI 48109 seealso: cn=All Staff, ou=Groups, o=University of Michigan, c=US -uid: melliot -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 homephone: +1 313 555 0388 drink: Gasoline @@ -350,17 +301,12 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Ursula Hampster sn: Hampster 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 -uid: uham homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 -krbname: jdoe@umich.edu -nobatchupdates: TRUE -onvacation: FALSE mail: uham@mail.alumni.umich.edu homephone: +1 313 555 8421 pager: +1 313 555 2844 diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index 7cdd35b12b..9ee7964321 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -63,8 +63,8 @@ dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University changetype: modify # EMBEDDED COMMENT CONTINUED -replace: multilinedescription -multilinedescription: The replaced multiLineDescription $ Blah Woof. +replace: description +description: The replaced multiLineDescription $ Blah Woof. - replace: drink drink: Iced Tea @@ -92,18 +92,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Gern Jensen +sn: Jensen 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 -uid: gjensen -krbname: gjensen@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Coffee homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 -multilinedescription: Very odd +description: Very odd facsimiletelephonenumber: +1 313 555 7557 telephonenumber: +1 313 555 8343 mail: gjensen@mailgw.umich.edu diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication index 0a26dafbcb..32bcf1aed2 100755 --- a/tests/scripts/test007-replication +++ b/tests/scripts/test007-replication @@ -122,18 +122,14 @@ objectclass: top objectclass: person objectclass: organizationalPerson objectclass: newPilotPerson -objectclass: umichPerson cn: Gern Jensen +sn: Jensen 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 -uid: gjensen -krbname: gjensen@umich.edu -nobatchupdates: TRUE -onvacation: FALSE drink: Coffee homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 -multilinedescription: Very odd +description: Very odd facsimiletelephonenumber: +1 313 555 7557 telephonenumber: +1 313 555 8343 mail: gjensen@mailgw.umich.edu