From: Kurt Zeilenga Date: Wed, 21 Apr 2004 22:14:01 +0000 (+0000) Subject: Removing University of Michigan from installation test suite (ITS#3107) X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~451 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=53a45a04fe813a9ab4f700fa1feb5259410bd11a;p=openldap Removing University of Michigan from installation test suite (ITS#3107) from Paul Turgyan of University of Michigan. --- diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master index 45afe5d077..5d7333248f 100644 --- a/tests/data/acl.out.master +++ b/tests/data/acl.out.master @@ -1,118 +1,122 @@ -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 +facsimileTelephoneNumber: +1 313 555 4332 +telephoneNumber: +1 313 555 0895 -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com cn: All Staff description: Everyone in the sample data -objectclass: groupofnames +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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff -objectclass: groupofnames +objectClass: groupOfNames -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Alumni Association,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Alumni Association -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit - y of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com +objectClass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 +postalAddress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com mail: bjensen@mailgw.example.com -homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 +homePostalAddress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water -homephone: +1 313 555 2333 -homephone: +1 313 555 5444 +homePhone: +1 313 555 2333 pager: +1 313 555 3233 -facsimiletelephonenumber: +1 313 555 2274 -telephonenumber: +1 313 555 9022 +facsimileTelephoneNumber: +1 313 555 2274 +telephoneNumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com +objectClass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen uid: bjorn -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US -homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea description: Hiker, biker title: Director, Embedded Systems -postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com -homephone: +1 313 555 5444 +homePhone: +1 313 555 5444 pager: +1 313 555 4474 -facsimiletelephonenumber: +1 313 555 2177 -telephonenumber: +1 313 555 0355 +facsimileTelephoneNumber: +1 313 555 2177 +telephoneNumber: +1 313 555 0355 -dn: ou=Groups,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: dc=example,dc=com +objectClass: top +objectClass: organization +objectClass: domainRelatedObject +objectClass: dcObject +dc: example +l: Anytown, Michigan +st: Michigan +o: Example, Inc. +o: UMICH +o: UM +o: U-M +o: U of M +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US +telephoneNumber: +1 313 764-1817 +associatedDomain: example.com + +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit ou: Groups -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Information Technology Division,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD woLDgsKKT8ODwoPDgsKDw4PCgsOCwqs6w4PCg8OCwoLDg8KCw4LCjUQkw4PCg8OCwoLDg8KCw4LCi @@ -254,86 +258,69 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff -objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US -uniquemember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=U - niversity of Michigan,c=US -uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=People, - o=University of Michigan,c=US -uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US -uniquemember: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University - of Michigan,c=US +objectClass: groupOfUniqueNames +uniqueMember: cn=Manager,dc=example,dc=com +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= + example,dc=com +uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=People, + dc=example,dc=com +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +uniqueMember: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc + =com -dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Universi - ty of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=example + ,dc=com +objectClass: OpenLDAPperson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe 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 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 933 Brooks $ Anytown, MI 48104 +homePhone: +1 313 555 8838 title: Senior Manager, Information Technology Division description: Not around very much mail: jjones@mailgw.example.com -postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W William $ Anytown, MI 48103 pager: +1 313 555 2833 -facsimiletelephonenumber: +1 313 555 8688 -telephonenumber: +1 313 555 7334 +facsimileTelephoneNumber: +1 313 555 8688 +telephoneNumber: +1 313 555 7334 -dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M - ichigan,c=US -objectclass: OpenLDAPperson +dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com +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 -homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 +postalAddress: ITD $ 535 W. William $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 912 East Bllvd $ Anytown, MI 48104 title: System Administrator, Information Technology Division description: overworked! mail: johnd@mailgw.example.com -homephone: +1 313 555 3774 +homePhone: +1 313 555 3774 pager: +1 313 555 6573 -facsimiletelephonenumber: +1 313 555 4544 -telephonenumber: +1 313 555 9394 +facsimileTelephoneNumber: +1 313 555 4544 +telephoneNumber: +1 313 555 9394 -dn: cn=Manager,o=University of Michigan,c=US -objectclass: person +dn: cn=Manager,dc=example,dc=com +objectClass: person cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory -dn: ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=People,dc=example,dc=com +objectClass: organizationalUnit objectClass: extensibleObject ou: People uidNumber: 0 gidNumber: 0 -dn: o=University of Michigan,c=US -objectclass: organization -objectclass: domainRelatedObject -l: Ann Arbor, Michigan -st: Michigan -o: University of Michigan -o: UMICH -o: UM -o: U-M -o: U of M -description: The University of Michigan at Ann Arbor -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US -telephonenumber: +1 313 764-1817 -associateddomain: example.com - diff --git a/tests/data/certificate.out b/tests/data/certificate.out index 0a85b49428..e5e56b4ccd 100644 --- a/tests/data/certificate.out +++ b/tests/data/certificate.out @@ -1,16 +1,15 @@ # (userCertificate;binary=*) -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com objectClass: OpenLDAPperson objectClass: strongAuthenticationUser 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homePostalAddress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homePostalAddress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com homePhone: +1 313 555 2333 @@ -35,17 +34,16 @@ userCertificate;binary:: MIIDjDCCAvWgAwIBAgIBAzANBgkqhkiG9w0BAQQFADB3MQswCQYDV 5akCr5tdFQhuBLUXXDk/tTHGpIWt7OAjEmpuMzsz3GUB8Zf9rioHOs1DMw+GpzWdnFITxXhAqEDc3 quqPrpxZ -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com objectClass: OpenLDAPperson objectClass: strongAuthenticationUser 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 -homePostalAddress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com homePhone: +1 313 555 8421 pager: +1 313 555 2844 @@ -69,20 +67,21 @@ userCertificate;binary:: MIIDazCCAtSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADB3MQswCQYDV ds/HnaJsGcHI5JRG7CBJbW+wrwge3trJ1xHJI8prN # (cAcertificate=*) -dn: o=University of Michigan,c=US +dn: dc=example,dc=com +objectclass: dcobject +dc: example objectClass: organization objectClass: domainRelatedObject objectClass: extensibleObject -l: Ann Arbor, Michigan +l: Anytown, Michigan st: Michigan -o: University of Michigan +o: Example, Inc. o: UMICH o: UM o: U-M o: U of M -description: The University of Michigan at Ann Arbor -postalAddress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US telephoneNumber: +1 313 764-1817 associatedDomain: example.com cACertificate;binary:: MIIDVDCCAr2gAwIBAgIBADANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQ @@ -102,5 +101,5 @@ cACertificate;binary:: MIIDVDCCAr2gAwIBAgIBADANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQ ASt40dGlEODkE+FsLMt04sYl6kX7RGKg9a46DkeG+uzZnN/3252uCgh+rjNMFAglueUTERv3EtUB1 iXEoU3GyA== -# (userCertificate=2$EMAIL=ca@example.com,CN=Example CA,O=Openldap Example\5C, Ltd.,ST=California,C=US) - +# (userCertificate=2$EMAIL=ca@example.com,CN=Example CA,O=Openldap Example\5C, + Ltd.,ST=California,C=US) diff --git a/tests/data/certificate.tls b/tests/data/certificate.tls index 5aa35341bd..a99808dd10 100644 --- a/tests/data/certificate.tls +++ b/tests/data/certificate.tls @@ -1,16 +1,15 @@ # (userCertificate;binary=*) -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com objectClass: OpenLDAPperson objectClass: strongAuthenticationUser 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homePostalAddress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homePostalAddress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com homePhone: +1 313 555 2333 @@ -35,17 +34,16 @@ userCertificate;binary:: MIIDjDCCAvWgAwIBAgIBAzANBgkqhkiG9w0BAQQFADB3MQswCQYDV 5akCr5tdFQhuBLUXXDk/tTHGpIWt7OAjEmpuMzsz3GUB8Zf9rioHOs1DMw+GpzWdnFITxXhAqEDc3 quqPrpxZ -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com objectClass: OpenLDAPperson objectClass: strongAuthenticationUser 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 -homePostalAddress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com homePhone: +1 313 555 8421 pager: +1 313 555 2844 @@ -69,20 +67,22 @@ userCertificate;binary:: MIIDazCCAtSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADB3MQswCQYDV ds/HnaJsGcHI5JRG7CBJbW+wrwge3trJ1xHJI8prN # (cAcertificate=*) -dn: o=University of Michigan,c=US +dn: dc=example,dc=com +objectClass: top objectClass: organization objectClass: domainRelatedObject +objectclass: dcobject objectClass: extensibleObject -l: Ann Arbor, Michigan +dc: example +l: Anytown, Michigan st: Michigan -o: University of Michigan +o: Example, Inc. o: UMICH o: UM o: U-M o: U of M -description: The University of Michigan at Ann Arbor -postalAddress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US telephoneNumber: +1 313 764-1817 associatedDomain: example.com cACertificate;binary:: MIIDVDCCAr2gAwIBAgIBADANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQ @@ -103,17 +103,16 @@ cACertificate;binary:: MIIDVDCCAr2gAwIBAgIBADANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQ iXEoU3GyA== # (userCertificate=2$EMAIL=ca@example.com,CN=Example CA,O=Openldap Example\5C, Ltd.,ST=California,C=US) -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com objectClass: OpenLDAPperson objectClass: strongAuthenticationUser 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 -homePostalAddress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com homePhone: +1 313 555 8421 pager: +1 313 555 2844 @@ -137,18 +136,17 @@ userCertificate;binary:: MIIDazCCAtSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADB3MQswCQYDV ds/HnaJsGcHI5JRG7CBJbW+wrwge3trJ1xHJI8prN # (userCertificate:certificateExactMatch:=3$EMAIL=ca@example.com,CN=Example CA,O=Openldap Example\5C, Ltd.,ST=California,C=US) -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com objectClass: OpenLDAPperson objectClass: strongAuthenticationUser 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homePostalAddress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homePostalAddress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com homePhone: +1 313 555 2333 @@ -173,21 +171,22 @@ userCertificate;binary:: MIIDjDCCAvWgAwIBAgIBAzANBgkqhkiG9w0BAQQFADB3MQswCQYDV 5akCr5tdFQhuBLUXXDk/tTHGpIWt7OAjEmpuMzsz3GUB8Zf9rioHOs1DMw+GpzWdnFITxXhAqEDc3 quqPrpxZ -# (cAcertificate;binary:certificateMatch:=\30\82\03\54\30\82\02\bd\a0\03\02\01\02\02\01\00\30\0d\06\09\2a\86\48\86\f7\0d\01\01\04\05\00\30\77\31\0b\30\09\06\03\55\04\06\13\02\55\53\31\13\30\11\06\03\55\04\08\13\0a\43\61\6c\69\66\6f\72\6e\69\61\31\1f\30\1d\06\03\55\04\0a\13\16\4f\70\65\6e\4c\44\41\50\20\45\78\61\6d\70\6c\65\2c\20\4c\74\64\2e\31\13\30\11\06\03\55\04\03\13\0a\45\78\61\6d\70\6c\65\20\43\41\31\1d\30\1b\06\09\2a\86\48\86\f7\0d\01\09\01\16\0e\63\61\40\65\78\61\6d\70\6c\65\2e\63\6f\6d\30\1e\17\0d\30\33\31\30\31\37\31\36\33\30\34\31\5a\17\0d\30\34\31\30\31\36\31\36\33\30\34\31\5a\30\77\31\0b\30\09\06\03\55\04\06\13\02\55\53\31\13\30\11\06\03\55\04\08\13\0a\43\61\6c\69\66\6f\72\6e\69\61\31\1f\30\1d\06\03\55\04\0a\13\16\4f\70\65\6e\4c\44\41\50\20\45\78\61\6d\70\6c\65\2c\20\4c\74\64\2e\31\13\30\11\06\03\55\04\03\13\0a\45\78\61\6d\70\6c\65\20\43\41\31\1d\30\1b\06\09\2a\86\48\86\f7\0d\01\09\01\16\0e\63\61\40\65\78\61\6d\70\6c\65\2e\63\6f\6d\30\81\9f\30\0d\06\09\2a\86\48\86\f7\0d\01\01\01\05\00\03\81\8d\00\30\81\89\02\81\81\00\d9\63\50\6c\62\8a\c0\33\12\20\0b\ba\4c\ed\dc\68\ff\db\83\11\c3\52\74\01\9c\7a\1a\77\17\2e\1a\4d\26\c0\05\c8\0d\1b\61\97\40\ce\0b\f2\74\a7\aa\fe\e5\f4\8b\9a\3f\e0\1c\9c\dc\6e\f5\5c\00\1c\6c\96\71\0c\fb\6b\2f\0a\43\01\d3\0d\38\1b\ca\57\6a\fa\ef\24\e0\9e\96\ad\14\b7\c6\46\df\c5\59\ac\e3\e4\46\c5\62\4a\2b\59\64\de\fb\87\84\05\df\55\3f\37\9b\1d\d2\26\f8\33\c7\8a\95\1f\20\0c\d1\a0\d7\a3\02\03\01\00\01\a3\81\ef\30\81\ec\30\1d\06\03\55\1d\0e\04\16\04\14\4b\6f\21\1a\36\24\d2\90\f9\43\b0\53\47\2d\7d\e1\c0\e6\98\23\30\81\a1\06\03\55\1d\23\04\81\99\30\81\96\80\14\4b\6f\21\1a\36\24\d2\90\f9\43\b0\53\47\2d\7d\e1\c0\e6\98\23\a1\7b\a4\79\30\77\31\0b\30\09\06\03\55\04\06\13\02\55\53\31\13\30\11\06\03\55\04\08\13\0a\43\61\6c\69\66\6f\72\6e\69\61\31\1f\30\1d\06\03\55\04\0a\13\16\4f\70\65\6e\4c\44\41\50\20\45\78\61\6d\70\6c\65\2c\20\4c\74\64\2e\31\13\30\11\06\03\55\04\03\13\0a\45\78\61\6d\70\6c\65\20\43\41\31\1d\30\1b\06\09\2a\86\48\86\f7\0d\01\09\01\16\0e\63\61\40\65\78\61\6d\70\6c\65\2e\63\6f\6d\82\01\00\30\0c\06\03\55\1d\13\04\05\30\03\01\01\ff\30\19\06\03\55\1d\11\04\12\30\10\81\0e\63\61\40\65\78\61\6d\70\6c\65\2e\63\6f\6d\30\0d\06\09\2a\86\48\86\f7\0d\01\01\04\05\00\03\81\81\00\a0\5c\3f\fe\db\c1\25\dc\65\e2\fe\ec\4c\34\42\aa\b6\72\21\41\d4\e7\35\4e\22\97\47\d9\ea\97\26\1c\f1\42\fb\ad\41\75\da\30\f7\46\59\66\1e\46\6e\0e\59\07\11\51\84\35\cd\f0\af\df\8b\1d\de\c1\14\a3\01\2b\78\d1\d1\a5\10\e0\e4\13\e1\6c\2c\cb\74\e2\c6\25\ea\45\fb\44\62\a0\f5\ae\3a\0e\47\86\fa\ec\d9\9c\df\f7\db\9d\ae\0a\08\7e\ae\33\4c\14\08\25\b9\e5\13\11\1b\f7\12\d5\01\d6\25\c4\a1\4d\c6\c8) -dn: o=University of Michigan,c=US +dn: dc=example,dc=com +objectClass: top objectClass: organization objectClass: domainRelatedObject +objectclass: dcobject objectClass: extensibleObject -l: Ann Arbor, Michigan +dc: example +l: Anytown, Michigan st: Michigan -o: University of Michigan +o: Example, Inc. o: UMICH o: UM o: U-M o: U of M -description: The University of Michigan at Ann Arbor -postalAddress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US telephoneNumber: +1 313 764-1817 associatedDomain: example.com cACertificate;binary:: MIIDVDCCAr2gAwIBAgIBADANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQ @@ -207,3 +206,4 @@ cACertificate;binary:: MIIDVDCCAr2gAwIBAgIBADANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQ ASt40dGlEODkE+FsLMt04sYl6kX7RGKg9a46DkeG+uzZnN/3252uCgh+rjNMFAglueUTERv3EtUB1 iXEoU3GyA== +# (cAcertificate;binary:certificateMatch:=\30\82\03\54\30\82\02\bd\a0\03\02\01\02\02\01\00\30\0d\06\09\2a\86\48\86\f7\0d\01\01\04\05\00\30\77\31\0b\30\09\06\03\55\04\06\13\02\55\53\31\13\30\11\06\03\55\04\08\13\0a\43\61\6c\69\66\6f\72\6e\69\61\31\1f\30\1d\06\03\55\04\0a\13\16\4f\70\65\6e\4c\44\41\50\20\45\78\61\6d\70\6c\65\2c\20\4c\74\64\2e\31\13\30\11\06\03\55\04\03\13\0a\45\78\61\6d\70\6c\65\20\43\41\31\1d\30\1b\06\09\2a\86\48\86\f7\0d\01\09\01\16\0e\63\61\40\65\78\61\6d\70\6c\65\2e\63\6f\6d\30\1e\17\0d\30\33\31\30\31\37\31\36\33\30\34\31\5a\17\0d\30\34\31\30\31\36\31\36\33\30\34\31\5a\30\77\31\0b\30\09\06\03\55\04\06\13\02\55\53\31\13\30\11\06\03\55\04\08\13\0a\43\61\6c\69\66\6f\72\6e\69\61\31\1f\30\1d\06\03\55\04\0a\13\16\4f\70\65\6e\4c\44\41\50\20\45\78\61\6d\70\6c\65\2c\20\4c\74\64\2e\31\13\30\11\06\03\55\04\03\13\0a\45\78\61\6d\70\6c\65\20\43\41\31\1d\30\1b\06\09\2a\86\48\86\f7\0d\01\09\01\16\0e\63\61\40\65\78\61\6d\70\6c\65\2e\63\6f\6d\30\81\9f\30\0d\06\09\2a\86\48\86\f7\0d\01\01\01\05\00\03\81\8d\00\30\81\89\02\81\81\00\d9\63\50\6c\62\8a\c0\33\12\20\0b\ba\4c\ed\dc\68\ff\db\83\11\c3\52\74\01\9c\7a\1a\77\17\2e\1a\4d\26\c0\05\c8\0d\1b\61\97\40\ce\0b\f2\74\a7\aa\fe\e5\f4\8b\9a\3f\e0\1c\9c\dc\6e\f5\5c\00\1c\6c\96\71\0c\fb\6b\2f\0a\43\01\d3\0d\38\1b\ca\57\6a\fa\ef\24\e0\9e\96\ad\14\b7\c6\46\df\c5\59\ac\e3\e4\46\c5\62\4a\2b\59\64\de\fb\87\84\05\df\55\3f\37\9b\1d\d2\26\f8\33\c7\8a\95\1f\20\0c\d1\a0\d7\a3\02\03\01\00\01\a3\81\ef\30\81\ec\30\1d\06\03\55\1d\0e\04\16\04\14\4b\6f\21\1a\36\24\d2\90\f9\43\b0\53\47\2d\7d\e1\c0\e6\98\23\30\81\a1\06\03\55\1d\23\04\81\99\30\81\96\80\14\4b\6f\21\1a\36\24\d2\90\f9\43\b0\53\47\2d\7d\e1\c0\e6\98\23\a1\7b\a4\79\30\77\31\0b\30\09\06\03\55\04\06\13\02\55\53\31\13\30\11\06\03\55\04\08\13\0a\43\61\6c\69\66\6f\72\6e\69\61\31\1f\30\1d\06\03\55\04\0a\13\16\4f\70\65\6e\4c\44\41\50\20\45\78\61\6d\70\6c\65\2c\20\4c\74\64\2e\31\13\30\11\06\03\55\04\03\13\0a\45\78\61\6d\70\6c\65\20\43\41\31\1d\30\1b\06\09\2a\86\48\86\f7\0d\01\09\01\16\0e\63\61\40\65\78\61\6d\70\6c\65\2e\63\6f\6d\82\01\00\30\0c\06\03\55\1d\13\04\05\30\03\01\01\ff\30\19\06\03\55\1d\11\04\12\30\10\81\0e\63\61\40\65\78\61\6d\70\6c\65\2e\63\6f\6d\30\0d\06\09\2a\86\48\86\f7\0d\01\01\04\05\00\03\81\81\00\a0\5c\3f\fe\db\c1\25\dc\65\e2\fe\ec\4c\34\42\aa\b6\72\21\41\d4\e7\35\4e\22\97\47\d9\ea\97\26\1c\f1\42\fb\ad\41\75\da\30\f7\46\59\66\1e\46\6e\0e\59\07\11\51\84\35\cd\f0\af\df\8b\1d\de\c1\14\a3\01\2b\78\d1\d1\a5\10\e0\e4\13\e1\6c\2c\cb\74\e2\c6\25\ea\45\fb\44\62\a0\f5\ae\3a\0e\47\86\fa\ec\d9\9c\df\f7\db\9d\ae\0a\08\7e\ae\33\4c\14\08\25\b9\e5\13\11\1b\f7\12\d5\01\d6\25\c4\a1\4d\c6\c8) diff --git a/tests/data/ditcontentrules.conf b/tests/data/ditcontentrules.conf index e805ec8d73..8e40f1c948 100644 --- a/tests/data/ditcontentrules.conf +++ b/tests/data/ditcontentrules.conf @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -12,7 +12,7 @@ ## top-level directory of the distribution or, alternatively, at ## . -ditcontentrule ( 2.5.6.4 NAME 'organization' AUX domainRelatedObject ) +ditcontentrule ( 2.5.6.4 NAME 'organization' AUX ( domainRelatedObject $ dcObject ) ) ditcontentrule ( 2.5.6.5 NAME 'organizationalUnit' AUX extensibleObject ) ditcontentrule ( 2.5.6.9 NAME 'groupOfNames' ) ditcontentrule ( 2.5.6.17 NAME 'groupOfUniqueNames' ) diff --git a/tests/data/do_add.1 b/tests/data/do_add.1 index 575193ec22..75d50829d0 100644 --- a/tests/data/do_add.1 +++ b/tests/data/do_add.1 @@ -1,19 +1,18 @@ -cn=James A Jones 2,ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: OpenLDAPperson +cn=James A Jones 2,ou=Alumni Association,ou=People,dc=example,dc=com +objectClass: OpenLDAPperson cn: James A Jones 2 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff, ou=Groups, dc=example,dc=com userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 - +facsimileTelephoneNumber: +1 313 555 4332 +telephoneNumber: +1 313 555 0895 diff --git a/tests/data/do_add.2 b/tests/data/do_add.2 index 0940b3a0d4..d250f6aec9 100644 --- a/tests/data/do_add.2 +++ b/tests/data/do_add.2 @@ -1,19 +1,18 @@ -cn=James A Jones 3,ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: OpenLDAPperson +cn=James A Jones 3,ou=Alumni Association,ou=People,dc=example,dc=com +objectClass: OpenLDAPperson cn: James A Jones 3 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff, ou=Groups, dc=example,dc=com userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 - +facsimileTelephoneNumber: +1 313 555 4332 +telephoneNumber: +1 313 555 0895 diff --git a/tests/data/do_add.3 b/tests/data/do_add.3 index bd556a7cc7..36c9cd214c 100644 --- a/tests/data/do_add.3 +++ b/tests/data/do_add.3 @@ -1,19 +1,18 @@ -cn=James A Jones 4,ou=People,o=University of Michigan,c=US -objectclass: OpenLDAPperson +cn=James A Jones 4,ou=People,dc=example,dc=com +objectClass: OpenLDAPperson cn: James A Jones 4 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff, ou=Groups, dc=example,dc=com userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 - +facsimileTelephoneNumber: +1 313 555 4332 +telephoneNumber: +1 313 555 0895 diff --git a/tests/data/do_add.4 b/tests/data/do_add.4 index e006dca4b7..4c79b6bf66 100644 --- a/tests/data/do_add.4 +++ b/tests/data/do_add.4 @@ -1,19 +1,18 @@ -cn=James A Jones 5,o=University of Michigan,c=US -objectclass: OpenLDAPperson +cn=James A Jones 5,dc=example,dc=com +objectClass: OpenLDAPperson cn: James A Jones 5 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff, ou=Groups, dc=example,dc=com userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 homephone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 - +facsimileTelephoneNumber: +1 313 555 4332 +telephoneNumber: +1 313 555 0895 diff --git a/tests/data/do_modrdn.0 b/tests/data/do_modrdn.0 index 592276a1b5..96620ed2c7 100644 --- a/tests/data/do_modrdn.0 +++ b/tests/data/do_modrdn.0 @@ -1,4 +1,4 @@ -cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michigan,c=US -cn=John Doe,ou=Information Technology Division,ou=People,o=University of Michigan,c=US -cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=US -cn=James A Jones 2,ou=Information Technology Division,ou=People,o=University of Michigan,c=US +cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com +cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=example,dc=com diff --git a/tests/data/do_read.0 b/tests/data/do_read.0 index 25dc6761dd..e6f0e2fd6b 100644 --- a/tests/data/do_read.0 +++ b/tests/data/do_read.0 @@ -1,5 +1,5 @@ -cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US -cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -ou=Groups, o=University of Michigan, c=US -ou=Alumni Association, ou=People, o=University of Michigan, c=US -cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com +cn=ITD Staff,ou=Groups,dc=example,dc=com +ou=Groups, dc=example,dc=com +ou=Alumni Association, ou=People, dc=example,dc=com +cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example,dc=com diff --git a/tests/data/do_search.0 b/tests/data/do_search.0 index ea0e29b643..887c09001f 100644 --- a/tests/data/do_search.0 +++ b/tests/data/do_search.0 @@ -1,10 +1,10 @@ -o=university of michigan,c=us +dc=example,dc=com cn=Barbara Jensen -ou=people,o=university of michigan,c=us +ou=people,dc=example,dc=com cn=Bjorn Jensen -ou=people,o=university of michigan,c=us +ou=people,dc=example,dc=com cn=James A Jones 1 -o=university of michigan,c=us +dc=example,dc=com cn=Bjorn Jensen -o=university of michigan,c=us +dc=example,dc=com cn=Alumni Assoc Staff diff --git a/tests/data/lang-out.ldif b/tests/data/lang-out.ldif index 55bef249ad..192c424501 100644 --- a/tests/data/lang-out.ldif +++ b/tests/data/lang-out.ldif @@ -1,8 +1,10 @@ -dn: o=University of Michigan,c=US +dn: dc=example,dc=com +objectClass: dcObject objectClass: organization objectClass: extensibleObject -o: University of Michigan -o;lang-x;lang-xx;lang-y;lang-yy;lang-z;lang-zz: University of Michigan +dc: example +o: Example, Inc. +o;lang-x;lang-xx;lang-y;lang-yy;lang-z;lang-zz: Example, Inc. name;lang-en-us: Billy Ray name;lang-en-us: Billy Bob cn;lang-en-us: Billy Ray @@ -10,9 +12,9 @@ name: Billy Ray sn;lang-en-gb;lang-en-us: Billy Ray sn: Ray -dn: o=University of Michigan,c=US -o: University of Michigan -o;lang-x;lang-xx;lang-y;lang-yy;lang-z;lang-zz: University of Michigan +dn: dc=example,dc=com +o: Example, Inc. +o;lang-x;lang-xx;lang-y;lang-yy;lang-z;lang-zz: Example, Inc. name;lang-en-us: Billy Ray name;lang-en-us: Billy Bob cn;lang-en-us: Billy Ray @@ -20,13 +22,13 @@ name: Billy Ray sn;lang-en-gb;lang-en-us: Billy Ray sn: Ray -dn: o=University of Michigan,c=US +dn: dc=example,dc=com name;lang-en-us: Billy Ray name;lang-en-us: Billy Bob cn;lang-en-us: Billy Ray sn;lang-en-gb;lang-en-us: Billy Ray -dn: o=University of Michigan,c=US +dn: dc=example,dc=com name;lang-en-us: Billy Ray name;lang-en-us: Billy Bob cn;lang-en-us: Billy Ray diff --git a/tests/data/modify.out.master b/tests/data/modify.out.master index 5384cd4134..411823fc4b 100644 --- a/tests/data/modify.out.master +++ b/tests/data/modify.out.master @@ -1,116 +1,126 @@ -dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=All Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com cn: All Staff -objectclass: groupofnames -member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mic - higan,c=US +objectClass: groupOfNames +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com -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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff -objectclass: groupofnames +objectClass: groupOfNames -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Alumni Association,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Alumni Association -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit - y of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com +objectClass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 -userpassword:: YmplbnNlbg== +postalAddress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com -homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 +homePostalAddress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water -homephone: +1 313 555 2333 +homePhone: +1 313 555 2333 pager: +1 313 555 3233 -facsimiletelephonenumber: +1 313 555 2274 -telephonenumber: +1 313 555 9022 +facsimileTelephoneNumber: +1 313 555 2274 +telephoneNumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com +objectClass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen 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 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: Ympvcm4= +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 +postalAddress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com -homephone: +1 313 555 5444 +homePhone: +1 313 555 5444 pager: +1 313 555 4474 -facsimiletelephonenumber: +1 313 555 2177 -telephonenumber: +1 313 555 0355 +facsimileTelephoneNumber: +1 313 555 2177 +telephoneNumber: +1 313 555 0355 description: The replaced multiLineDescription $ Blah Woof. drink: Iced Tea drink: Mad Dog 20/20 -dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Lemonade -homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 +homePostalAddress: 377 White St. Apt. 3 $ Anytown, MI 48104 description: Very tall -facsimiletelephonenumber: +1 313 555 3223 -telephonenumber: +1 313 555 3664 +facsimileTelephoneNumber: +1 313 555 3223 +telephoneNumber: +1 313 555 3664 mail: dots@mail.alumni.example.com -homephone: +1 313 555 0454 +homePhone: +1 313 555 0454 -dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,o=University o - f Michigan,c=US -objectclass: OpenLDAPperson +dn: dc=example,dc=com +objectClass: top +objectClass: organization +objectClass: domainRelatedObject +objectClass: dcObject +dc: example +l: Anytown, Michigan +st: Michigan +o: Example, Inc. +o: UMICH +o: UM +o: U-M +o: U of M +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US +telephoneNumber: +1 313 764-1817 +associatedDomain: example.com + +dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,dc=example,dc= + com +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 +postalAddress: ITD $ 535 W. William St $ Anytown, MI 48103 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Coffee -homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 +homePostalAddress: 844 Brown St. Apt. 4 $ Anytown, MI 48104 description: Very odd -facsimiletelephonenumber: +1 313 555 7557 -telephonenumber: +1 313 555 8343 +facsimileTelephoneNumber: +1 313 555 7557 +telephoneNumber: +1 313 555 8343 mail: gjensen@mailgw.example.com -homephone: +1 313 555 8844 +homePhone: +1 313 555 8844 -dn: ou=Groups,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit ou: Groups -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Information Technology Division,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD woLDgsKKT8ODwoPDgsKDw4PCgsOCwqs6w4PCg8OCwoLDg8KCw4LCjUQkw4PCg8OCwoLDg8KCw4LCi @@ -252,157 +262,136 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff -objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US -uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US -uniquemember: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University - of Michigan,c=US -uniquemember: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University - of Michigan,c=US +objectClass: groupOfUniqueNames +uniqueMember: cn=Manager,dc=example,dc=com +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +uniqueMember: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc + =com +uniqueMember: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc + =com -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +objectClass: OpenLDAPperson cn: James A Jones 1 cn: James Jones cn: Jim 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 -userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: amFq +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 +facsimileTelephoneNumber: +1 313 555 4332 +telephoneNumber: +1 313 555 0895 drink: Orange Juice sn: Jones -dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 drink: diet coke description: Enthusiastic mail: jdoe@woof.net -homephone: +1 313 555 5445 +homePhone: +1 313 555 5445 pager: +1 313 555 1220 -facsimiletelephonenumber: +1 313 555 2311 -telephonenumber: +1 313 555 4774 +facsimileTelephoneNumber: +1 313 555 2311 +telephoneNumber: +1 313 555 4774 -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US -objectclass: OpenLDAPperson +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homePostalAddress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com -homephone: +1 313 555 2333 +homePhone: +1 313 555 2333 pager: +1 313 555 6442 -facsimiletelephonenumber: +1 313 555 2756 -telephonenumber: +1 313 555 8232 +facsimileTelephoneNumber: +1 313 555 2756 +telephoneNumber: +1 313 555 8232 -dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M - ichigan,c=US -objectclass: OpenLDAPperson +dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com +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 -homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 +postalAddress: ITD $ 535 W. William $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 912 East Bllvd $ Anytown, MI 48104 title: System Administrator, Information Technology Division description: overworked! mail: johnd@mailgw.example.com -homephone: +1 313 555 3774 +homePhone: +1 313 555 3774 pager: +1 313 555 6573 -facsimiletelephonenumber: +1 313 555 4544 -telephonenumber: +1 313 555 9394 +facsimileTelephoneNumber: +1 313 555 4544 +telephoneNumber: +1 313 555 9394 -dn: cn=Manager,o=University of Michigan,c=US -objectclass: person +dn: cn=Manager,dc=example,dc=com +objectClass: person cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory -userpassword:: c2VjcmV0 +userPassword:: c2VjcmV0 -dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= - US -objectclass: OpenLDAPperson +dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 -homephone: +1 313 555 0388 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 199 Outer Drive $ Ypsilanti, MI 48198 +homePhone: +1 313 555 0388 drink: Gasoline title: Director, UM Alumni Association mail: melliot@mail.alumni.example.com pager: +1 313 555 7671 -facsimiletelephonenumber: +1 313 555 7762 -telephonenumber: +1 313 555 4177 +facsimileTelephoneNumber: +1 313 555 7762 +telephoneNumber: +1 313 555 4177 -dn: ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit -objectclass: extensibleObject +dn: ou=People,dc=example,dc=com +objectClass: organizationalUnit +objectClass: extensibleObject ou: People uidNumber: 1 gidNumber: -1 -dn: o=University of Michigan,c=US -objectclass: organization -objectclass: domainRelatedObject -l: Ann Arbor, Michigan -st: Michigan -o: University of Michigan -o: UMICH -o: UM -o: U-M -o: U of M -description: The University of Michigan at Ann Arbor -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US -telephonenumber: +1 313 764-1817 -associateddomain: example.com - -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com -homephone: +1 313 555 8421 +homePhone: +1 313 555 8421 pager: +1 313 555 2844 -facsimiletelephonenumber: +1 313 555 9700 -telephonenumber: +1 313 555 5331 +facsimileTelephoneNumber: +1 313 555 9700 +telephoneNumber: +1 313 555 5331 diff --git a/tests/data/modrdn.out.master b/tests/data/modrdn.out.master index a5bfcee541..9a1230d13c 100644 --- a/tests/data/modrdn.out.master +++ b/tests/data/modrdn.out.master @@ -1,67 +1,55 @@ -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com 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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff objectclass: groupofnames -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: ou=Alumni Association,ou=People,dc=example,dc=com objectclass: organizationalUnit ou: Alumni Association -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Univer - sity of Michigan,c=US +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 +postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com userpassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com -homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 +homepostaladdress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 @@ -69,50 +57,48 @@ pager: +1 313 555 3233 facsimiletelephonenumber: +1 313 555 2274 telephonenumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Universi - ty of Michigan,c=US +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen uid: bjorn -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,dc=example,dc=com userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea description: Hiker, biker title: Director, Embedded Systems -postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 +postaladdress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com homephone: +1 313 555 5444 pager: +1 313 555 4474 facsimiletelephonenumber: +1 313 555 2177 telephonenumber: +1 313 555 0355 -dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US +dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Lemonade -homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 +homepostaladdress: 377 White St. Apt. 3 $ Anytown, MI 48104 description: Very tall facsimiletelephonenumber: +1 313 555 3223 telephonenumber: +1 313 555 3664 mail: dots@mail.alumni.example.com homephone: +1 313 555 0454 -dn: ou=Groups,o=University of Michigan,c=US +dn: ou=Groups,dc=example,dc=com objectclass: organizationalUnit ou: Groups -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c - =US +dn: ou=Information Technology Division,ou=People,dc=example,dc=com objectclass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD @@ -255,40 +241,39 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US -uniquemember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=U - niversity of Michigan,c=US +uniquemember: cn=Manager,dc=example,dc=com +uniquemember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= + example,dc=com uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=People, - o=University of Michigan,c=US -uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US + dc=example,dc=com +uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com -dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univ - ersity of Michigan,c=US +dn: cn=James A Jones II,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com objectclass: OpenLDAPperson cn: James Jones cn: Jim Jones cn: James A Jones II sn: Doe uid: jjones -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US -homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 933 Brooks $ Anytown, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division description: Not around very much mail: jjones@mailgw.example.com -postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 +postaladdress: Info Tech Division $ 535 W William $ Anytown, MI 48103 pager: +1 313 555 2833 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 +dn: cn=James A Jones III,ou=Alumni Association,ou=People,dc=example,dc=com objectclass: OpenLDAPperson cn: James A Jones 1 cn: James Jones @@ -296,10 +281,10 @@ 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 +homepostaladdress: 3882 Beverly Rd. $ Anytown, MI 48105 homephone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association @@ -308,17 +293,16 @@ mail: jaj@mail.alumni.example.com 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 +dn: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 123 Anystreet $ Anytown, MI 48104 drink: diet coke description: Enthusiastic mail: jdoe@woof.net @@ -327,17 +311,16 @@ pager: +1 313 555 1220 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 +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homepostaladdress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com homephone: +1 313 555 2333 @@ -345,16 +328,15 @@ pager: +1 313 555 6442 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 +dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com 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 -homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 +postaladdress: ITD $ 535 W. William $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 912 East Bllvd $ Anytown, MI 48104 title: System Administrator, Information Technology Division description: overworked! mail: johnd@mailgw.example.com @@ -363,7 +345,7 @@ pager: +1 313 555 6573 facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 -dn: cn=Manager,o=University of Michigan,c=US +dn: cn=Manager,dc=example,dc=com objectclass: person cn: Manager cn: Directory Manager @@ -372,15 +354,14 @@ sn: Manager description: Manager of the directory userpassword:: c2VjcmV0 -dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US +dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 homephone: +1 313 555 0388 drink: Gasoline @@ -390,42 +371,41 @@ pager: +1 313 555 7671 facsimiletelephonenumber: +1 313 555 7762 telephonenumber: +1 313 555 4177 -dn: ou=People,o=University of Michigan,c=US +dn: ou=People,dc=example,dc=com objectclass: organizationalUnit objectclass: extensibleObject ou: People uidNumber: 0 gidNumber: 0 -dn: o=University of Michigan,c=US +dn: dc=example,dc=com +objectclass: dcobject +dc: example objectclass: organization objectclass: domainRelatedObject -l: Ann Arbor, Michigan +l: Anytown, Michigan st: Michigan -o: University of Michigan +o: Example, Inc. o: UMICH o: UM o: U-M o: U of M -description: The University of Michigan at Ann Arbor -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US +description: The Example, Inc. at Anytown +postaladdress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US telephonenumber: +1 313 764-1817 associateddomain: example.com -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com homephone: +1 313 555 8421 pager: +1 313 555 2844 facsimiletelephonenumber: +1 313 555 9700 telephonenumber: +1 313 555 5331 - diff --git a/tests/data/modrdn.out.master.0 b/tests/data/modrdn.out.master.0 index 80b6e800ad..2deabd61bb 100644 --- a/tests/data/modrdn.out.master.0 +++ b/tests/data/modrdn.out.master.0 @@ -1,118 +1,123 @@ -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com cn: All Staff description: Everyone in the sample data -objectclass: groupofnames +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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff -objectclass: groupofnames +objectClass: groupOfNames -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Alumni Association,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Alumni Association -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit - y of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com +objectClass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 -userpassword:: YmplbnNlbg== +postalAddress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com -homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 +homePostalAddress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water -homephone: +1 313 555 2333 +homePhone: +1 313 555 2333 pager: +1 313 555 3233 -facsimiletelephonenumber: +1 313 555 2274 -telephonenumber: +1 313 555 9022 +facsimileTelephoneNumber: +1 313 555 2274 +telephoneNumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com +objectClass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen 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 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: Ympvcm4= +homePostalAddress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea description: Hiker, biker title: Director, Embedded Systems -postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com -homephone: +1 313 555 5444 +homePhone: +1 313 555 5444 pager: +1 313 555 4474 -facsimiletelephonenumber: +1 313 555 2177 -telephonenumber: +1 313 555 0355 +facsimileTelephoneNumber: +1 313 555 2177 +telephoneNumber: +1 313 555 0355 -dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Lemonade -homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 +homePostalAddress: 377 White St. Apt. 3 $ Anytown, MI 48104 description: Very tall -facsimiletelephonenumber: +1 313 555 3223 -telephonenumber: +1 313 555 3664 +facsimileTelephoneNumber: +1 313 555 3223 +telephoneNumber: +1 313 555 3664 mail: dots@mail.alumni.example.com -homephone: +1 313 555 0454 +homePhone: +1 313 555 0454 -dn: ou=Groups,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: dc=example,dc=com +objectClass: top +objectClass: organization +objectClass: domainRelatedObject +objectClass: dcObject +dc: example +l: Anytown, Michigan +st: Michigan +o: Example, Inc. +o: UMICH +o: UM +o: U-M +o: U of M +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US +telephoneNumber: +1 313 764-1817 +associatedDomain: example.com + +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit ou: Groups -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Information Technology Division,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD woLDgsKKT8ODwoPDgsKDw4PCgsOCwqs6w4PCg8OCwoLDg8KCw4LCjUQkw4PCg8OCwoLDg8KCw4LCi @@ -254,176 +259,155 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff -objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US -uniquemember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=U - niversity of Michigan,c=US -uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=People, - o=University of Michigan,c=US -uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US +objectClass: groupOfUniqueNames +uniqueMember: cn=Manager,dc=example,dc=com +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= + example,dc=com +uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=People, + dc=example,dc=com +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com -dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univers - ity of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones II,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +objectClass: OpenLDAPperson cn: James Jones cn: Jim Jones cn: James A Jones II sn: Doe 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 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 933 Brooks $ Anytown, MI 48104 +homePhone: +1 313 555 8838 title: Senior Manager, Information Technology Division description: Not around very much mail: jjones@mailgw.example.com -postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W William $ Anytown, MI 48103 pager: +1 313 555 2833 -facsimiletelephonenumber: +1 313 555 8688 -telephonenumber: +1 313 555 7334 +facsimileTelephoneNumber: +1 313 555 8688 +telephoneNumber: +1 313 555 7334 -dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Michi - gan,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones III,ou=Alumni Association,ou=People,dc=example,dc=com +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 -userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: amFq +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 +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: OpenLDAPperson +dn: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 drink: diet coke description: Enthusiastic mail: jdoe@woof.net -homephone: +1 313 555 5445 +homePhone: +1 313 555 5445 pager: +1 313 555 1220 -facsimiletelephonenumber: +1 313 555 2311 -telephonenumber: +1 313 555 4774 +facsimileTelephoneNumber: +1 313 555 2311 +telephoneNumber: +1 313 555 4774 -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US -objectclass: OpenLDAPperson +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homePostalAddress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com -homephone: +1 313 555 2333 +homePhone: +1 313 555 2333 pager: +1 313 555 6442 -facsimiletelephonenumber: +1 313 555 2756 -telephonenumber: +1 313 555 8232 +facsimileTelephoneNumber: +1 313 555 2756 +telephoneNumber: +1 313 555 8232 -dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M - ichigan,c=US -objectclass: OpenLDAPperson +dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com +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 -homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 +postalAddress: ITD $ 535 W. William $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 912 East Bllvd $ Anytown, MI 48104 title: System Administrator, Information Technology Division description: overworked! mail: johnd@mailgw.example.com -homephone: +1 313 555 3774 +homePhone: +1 313 555 3774 pager: +1 313 555 6573 -facsimiletelephonenumber: +1 313 555 4544 -telephonenumber: +1 313 555 9394 +facsimileTelephoneNumber: +1 313 555 4544 +telephoneNumber: +1 313 555 9394 -dn: cn=Manager,o=University of Michigan,c=US -objectclass: person +dn: cn=Manager,dc=example,dc=com +objectClass: person cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory -userpassword:: c2VjcmV0 +userPassword:: c2VjcmV0 -dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= - US -objectclass: OpenLDAPperson +dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 -homephone: +1 313 555 0388 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 199 Outer Drive $ Ypsilanti, MI 48198 +homePhone: +1 313 555 0388 drink: Gasoline title: Director, UM Alumni Association mail: melliot@mail.alumni.example.com pager: +1 313 555 7671 -facsimiletelephonenumber: +1 313 555 7762 -telephonenumber: +1 313 555 4177 +facsimileTelephoneNumber: +1 313 555 7762 +telephoneNumber: +1 313 555 4177 -dn: ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit -objectclass: extensibleObject +dn: ou=People,dc=example,dc=com +objectClass: organizationalUnit +objectClass: extensibleObject ou: People uidNumber: 0 gidNumber: 0 -dn: o=University of Michigan,c=US -objectclass: organization -objectclass: domainRelatedObject -l: Ann Arbor, Michigan -st: Michigan -o: University of Michigan -o: UMICH -o: UM -o: U-M -o: U of M -description: The University of Michigan at Ann Arbor -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US -telephonenumber: +1 313 764-1817 -associateddomain: example.com - -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com -homephone: +1 313 555 8421 +homePhone: +1 313 555 8421 pager: +1 313 555 2844 -facsimiletelephonenumber: +1 313 555 9700 -telephonenumber: +1 313 555 5331 +facsimileTelephoneNumber: +1 313 555 9700 +telephoneNumber: +1 313 555 5331 diff --git a/tests/data/modrdn.out.master.1 b/tests/data/modrdn.out.master.1 index 0f65790240..5466e51e6e 100644 --- a/tests/data/modrdn.out.master.1 +++ b/tests/data/modrdn.out.master.1 @@ -1,21 +1,20 @@ -dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Michi - gan,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones III,ou=Alumni Association,ou=People,dc=example,dc=com +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 -userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: amFq +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 +facsimileTelephoneNumber: +1 313 555 4332 +telephoneNumber: +1 313 555 0895 diff --git a/tests/data/modrdn.out.master.2 b/tests/data/modrdn.out.master.2 index e601274856..057ec93450 100644 --- a/tests/data/modrdn.out.master.2 +++ b/tests/data/modrdn.out.master.2 @@ -1,19 +1,19 @@ -dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univers - ity of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones II,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +objectClass: OpenLDAPperson cn: James Jones cn: Jim Jones cn: James A Jones II sn: Doe 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 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 933 Brooks $ Anytown, MI 48104 +homePhone: +1 313 555 8838 title: Senior Manager, Information Technology Division description: Not around very much mail: jjones@mailgw.example.com -postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W William $ Anytown, MI 48103 pager: +1 313 555 2833 -facsimiletelephonenumber: +1 313 555 8688 -telephonenumber: +1 313 555 7334 +facsimileTelephoneNumber: +1 313 555 8688 +telephoneNumber: +1 313 555 7334 diff --git a/tests/data/modrdn.out.master.3 b/tests/data/modrdn.out.master.3 index 8304974f2d..67299dc553 100644 --- a/tests/data/modrdn.out.master.3 +++ b/tests/data/modrdn.out.master.3 @@ -1,20 +1,19 @@ -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +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 -userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: amFq +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 +facsimileTelephoneNumber: +1 313 555 4332 +telephoneNumber: +1 313 555 0895 diff --git a/tests/data/passwd.ldif b/tests/data/passwd.ldif index a8768b095f..528957ee6b 100644 --- a/tests/data/passwd.ldif +++ b/tests/data/passwd.ldif @@ -1,26 +1,28 @@ -dn: o=University of Michigan,c=US +dn: dc=example,dc=com +objectclass: dcobject +dc: example objectclass: organization -o: University of Michigan +o: Example, Inc. -dn: cn=md5,o=University of Michigan,c=US +dn: cn=md5,dc=example,dc=com objectclass: person cn: md5 sn: md5 userpassword:: e01ENX1YcjRpbE96UTRQQ09xM2FRMHFidWFRPT0= -dn: cn=smd5,o=University of Michigan,c=US +dn: cn=smd5,dc=example,dc=com objectclass: person cn: smd5 sn: smd5 userpassword: secret -dn: cn=sha,o=University of Michigan,c=US +dn: cn=sha,dc=example,dc=com objectclass: person cn: sha sn: sha userpassword:: e1NIQX01ZW42RzZNZXpScm9UM1hLcWtkUE9tWS9CZlE9 -dn: cn=ssha,o=University of Michigan,c=US +dn: cn=ssha,dc=example,dc=com objectclass: person cn: ssha sn: ssha diff --git a/tests/data/referrals.ldif b/tests/data/referrals.ldif index 7bc83822f7..8824ae17f8 100644 --- a/tests/data/referrals.ldif +++ b/tests/data/referrals.ldif @@ -15,11 +15,11 @@ ref: ldap://hostC/o=xyz,c=us HostC objectclass: referral objectclass: extensibleObject -dn: o=University of Michigan,c=US -o: University of Michigan +dn: o=Example,c=US +o: Example objectclass: organization -dn: cn=Manager,o=University of Michigan,c=US +dn: cn=Manager,o=Example,c=US cn: Manager cn: Directory Manager cn: Dir Man diff --git a/tests/data/referrals.out b/tests/data/referrals.out index 4fac149bb5..fac5b745b6 100644 --- a/tests/data/referrals.out +++ b/tests/data/referrals.out @@ -93,8 +93,8 @@ result: 0 Success # requesting: 1.1 # -# University of Michigan, US -dn: o=University of Michigan,c=US +# Example, Inc., US +dn: o=Example,c=US # search reference ref: ldap://hostA/o=abc,c=us??base @@ -118,11 +118,11 @@ result: 0 Success # requesting: 1.1 # -# Manager, University of Michigan, US -dn: cn=Manager,o=University of Michigan,c=US +# Example, Inc., US +dn: o=Example,c=US -# University of Michigan, US -dn: o=University of Michigan,c=US +# Manager, Example, Inc., US +dn: cn=Manager,o=Example,c=US # US dn: c=US diff --git a/tests/data/search.out.master b/tests/data/search.out.master index 79ab08ab85..49eed95403 100644 --- a/tests/data/search.out.master +++ b/tests/data/search.out.master @@ -1,239 +1,220 @@ -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit - y of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com +objectClass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 -userpassword:: YmplbnNlbg== +postalAddress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com -homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 +homePostalAddress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water -homephone: +1 313 555 2333 +homePhone: +1 313 555 2333 pager: +1 313 555 3233 -facsimiletelephonenumber: +1 313 555 2274 -telephonenumber: +1 313 555 9022 +facsimileTelephoneNumber: +1 313 555 2274 +telephoneNumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com +objectClass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen 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 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: Ympvcm4= +homePostalAddress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea description: Hiker, biker title: Director, Embedded Systems -postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com -homephone: +1 313 555 5444 +homePhone: +1 313 555 5444 pager: +1 313 555 4474 -facsimiletelephonenumber: +1 313 555 2177 -telephonenumber: +1 313 555 0355 +facsimileTelephoneNumber: +1 313 555 2177 +telephoneNumber: +1 313 555 0355 -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit - y of Michigan,c=US +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= title: Mythical Manager, Research Systems -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen title: Director, Embedded Systems -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com cn: All Staff description: Everyone in the sample data -objectclass: groupofnames +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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff -objectclass: groupofnames +objectClass: groupOfNames -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff objectClass: groupOfUniqueNames -uniqueMember: cn=Manager,o=University of Michigan,c=US -uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=PEOPLE,o=U - niversity of Michigan,c=US -uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=PEOPLE, - o=University of Michigan,c=US -uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US +uniqueMember: cn=Manager,dc=example,dc=com +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= + example,dc=com +uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=People, + dc=example,dc=com +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +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 -userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: amFq +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 +facsimileTelephoneNumber: +1 313 555 4332 +telephoneNumber: +1 313 555 0895 -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com cn: All Staff description: Everyone in the sample data -objectclass: groupofnames +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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff -objectclass: groupofnames +objectClass: groupOfNames -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com cn: All Staff description: Everyone in the sample data -objectclass: groupofnames +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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff -objectclass: groupofnames +objectClass: groupOfNames -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Alumni Association,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Alumni Association -dn: ou=Groups,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: dc=example,dc=com +objectClass: top +objectClass: organization +objectClass: domainRelatedObject +objectClass: dcObject +dc: example +l: Anytown, Michigan +st: Michigan +o: Example, Inc. +o: UMICH +o: UM +o: U-M +o: U of M +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US +telephoneNumber: +1 313 764-1817 +associatedDomain: example.com + +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit ou: Groups -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Information Technology Division,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD woLDgsKKT8ODwoPDgsKDw4PCgsOCwqs6w4PCg8OCwoLDg8KCw4LCjUQkw4PCg8OCwoLDg8KCw4LCi @@ -375,20 +356,20 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff -objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US -uniquemember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=U - niversity of Michigan,c=US -uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=People, - o=University of Michigan,c=US -uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US +objectClass: groupOfUniqueNames +uniqueMember: cn=Manager,dc=example,dc=com +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= + example,dc=com +uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=People, + dc=example,dc=com +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com -dn: cn=Manager,o=University of Michigan,c=US +dn: cn=Manager,dc=example,dc=com objectClass: person cn: Manager cn: Directory Manager @@ -397,31 +378,14 @@ sn: Manager description: Manager of the directory userPassword:: c2VjcmV0 -dn: ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit -objectclass: extensibleObject +dn: ou=People,dc=example,dc=com +objectClass: organizationalUnit +objectClass: extensibleObject ou: People uidNumber: 0 gidNumber: 0 -dn: o=University of Michigan,c=US -objectclass: organization -objectclass: domainRelatedObject -l: Ann Arbor, Michigan -st: Michigan -o: University of Michigan -o: UMICH -o: UM -o: U-M -o: U of M -description: The University of Michigan at Ann Arbor -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US -telephonenumber: +1 313 764-1817 -associateddomain: example.com - -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com objectClass: OpenLDAPperson uid: uham diff --git a/tests/data/search.out.xsearch b/tests/data/search.out.xsearch index ae5538c298..4ca80d5a7a 100644 --- a/tests/data/search.out.xsearch +++ b/tests/data/search.out.xsearch @@ -1,67 +1,55 @@ -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com 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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff objectClass: groupofnames -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: ou=Alumni Association,ou=People,dc=example,dc=com objectClass: organizationalUnit ou: Alumni Association -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit - y of Michigan,c=US +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com objectClass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 +postalAddress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com userPassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com -homePostalAddress: 123 Wesley $ Ann Arbor, MI 48103 +homePostalAddress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water homePhone: +1 313 555 2333 @@ -69,49 +57,66 @@ pager: +1 313 555 3233 facsimileTelephoneNumber: +1 313 555 2274 telephoneNumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com objectClass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen uid: bjorn -seeAlso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com userPassword:: Ympvcm4= homePostalAddress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea description: Hiker, biker title: Director, Embedded Systems -postalAddress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com homePhone: +1 313 555 5444 pager: +1 313 555 4474 facsimileTelephoneNumber: +1 313 555 2177 telephoneNumber: +1 313 555 0355 -dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Lemonade -homePostalAddress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 +homePostalAddress: 377 White St. Apt. 3 $ Anytown, MI 48104 description: Very tall facsimileTelephoneNumber: +1 313 555 3223 telephoneNumber: +1 313 555 3664 mail: dots@mail.alumni.example.com homePhone: +1 313 555 0454 -dn: ou=Groups,o=University of Michigan,c=US +dn: dc=example,dc=com +objectClass: top +objectClass: organization +objectClass: domainRelatedObject +objectClass: dcObject +dc: example +l: Anytown, Michigan +st: Michigan +o: Example, Inc. +o: UMICH +o: UM +o: U-M +o: U of M +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US +telephoneNumber: +1 313 764-1817 +associatedDomain: example.com + +dn: ou=Groups,dc=example,dc=com objectClass: organizationalUnit ou: Groups -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US +dn: ou=Information Technology Division,ou=People,dc=example,dc=com objectClass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD @@ -254,31 +259,30 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff objectClass: groupOfUniqueNames -uniqueMember: cn=Manager,o=University of Michigan,c=US -uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=PEOPLE,o=U - niversity of Michigan,c=US +uniqueMember: cn=Manager,dc=example,dc=com +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=PEOPLE,dc= + example,dc=com uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=PEOPLE, - o=University of Michigan,c=US -uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US + dc=example,dc=com +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com userPassword:: amFq -homePostalAddress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association @@ -287,35 +291,35 @@ mail: jaj@mail.alumni.example.com facsimileTelephoneNumber: +1 313 555 4332 telephoneNumber: +1 313 555 0895 -dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Universi - ty of Michigan,c=US +dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=example + ,dc=com objectClass: OpenLDAPperson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe uid: jjones -seeAlso: cn=All Staff,ou=Groups,o=University of Michigan,c=US -homePostalAddress: 933 Brooks $ Ann Arbor, MI 48104 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 933 Brooks $ Anytown, MI 48104 homePhone: +1 313 555 8838 title: Senior Manager, Information Technology Division description: Not around very much mail: jjones@mailgw.example.com -postalAddress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W William $ Anytown, MI 48103 pager: +1 313 555 2833 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 +dn: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homePostalAddress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 drink: diet coke description: Enthusiastic mail: jdoe@woof.net @@ -324,17 +328,16 @@ pager: +1 313 555 1220 facsimileTelephoneNumber: +1 313 555 2311 telephoneNumber: +1 313 555 4774 -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homePostalAddress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homePostalAddress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com homePhone: +1 313 555 2333 @@ -342,16 +345,15 @@ pager: +1 313 555 6442 facsimileTelephoneNumber: +1 313 555 2756 telephoneNumber: +1 313 555 8232 -dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M - ichigan,c=US +dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com 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 -homePostalAddress: 912 East Bllvd $ Ann Arbor, MI 48104 +postalAddress: ITD $ 535 W. William $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 912 East Bllvd $ Anytown, MI 48104 title: System Administrator, Information Technology Division description: overworked! mail: johnd@mailgw.example.com @@ -360,7 +362,7 @@ pager: +1 313 555 6573 facsimileTelephoneNumber: +1 313 555 4544 telephoneNumber: +1 313 555 9394 -dn: cn=Manager,o=University of Michigan,c=US +dn: cn=Manager,dc=example,dc=com objectClass: person cn: Manager cn: Directory Manager @@ -369,15 +371,14 @@ sn: Manager description: Manager of the directory userPassword:: c2VjcmV0 -dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= - US +dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com homePostalAddress: 199 Outer Drive $ Ypsilanti, MI 48198 homePhone: +1 313 555 0388 drink: Gasoline @@ -387,45 +388,28 @@ pager: +1 313 555 7671 facsimileTelephoneNumber: +1 313 555 7762 telephoneNumber: +1 313 555 4177 -dn: ou=People,o=University of Michigan,c=US +dn: ou=People,dc=example,dc=com objectClass: organizationalUnit objectClass: extensibleObject ou: People uidNumber: 0 gidNumber: 0 -dn: o=University of Michigan,c=US -objectClass: organization -objectClass: domainRelatedObject -l: Ann Arbor, Michigan -st: Michigan -o: University of Michigan -o: UMICH -o: UM -o: U-M -o: U of M -description: The University of Michigan at Ann Arbor -postalAddress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US -telephoneNumber: +1 313 764-1817 -associatedDomain: example.com - -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homePostalAddress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com homePhone: +1 313 555 8421 pager: +1 313 555 2844 facsimileTelephoneNumber: +1 313 555 9700 telephoneNumber: +1 313 555 5331 -dn: o=University of Michigan,c=US -o: University of Michigan +dn: dc=example,dc=com +o: Example, Inc. diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index f9fa4b7d73..4d57608597 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -1,8 +1,9 @@ # master slapd config -- for testing -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-acl.conf,v 1.46.2.4 2003/12/15 22:05:29 + kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -35,9 +36,9 @@ access to * by * read database @BACKEND@ #ldbm#cachesize 0 -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.1.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub @@ -58,9 +59,9 @@ access to filter="(objectclass=person)" attr=userpassword dn.subtree="" by anonymous auth by self write -access to dn.children="ou=Alumni Association,ou=People,o=University of Michigan,c=US" - by dn.regex=".+,o=University of Michigan,c=US" +c continue - by dn.subtree="o=University of Michigan,c=US" +rs continue +access to dn.children="ou=Alumni Association,ou=People,dc=example,dc=com" + by dn.regex=".+,dc=example,dc=com" +c continue + by dn.subtree="dc=example,dc=com" +rs continue by * stop access to attr=member,uniquemember @@ -71,13 +72,18 @@ access to attr=member,uniquemember access to attr=member,uniquemember filter=(mail=*edu) by * read -access to filter="(&(objectclass=groupofnames)(objectClass=groupofuniquenames))" - by dn.base="cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US" =sc continue - by dn.regex="^cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US$" +rw stop +access to filter="(&(objectclass=groupofnames)(objectClass=groupofuniquenames) + )" + by dn.base="cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= + example,dc=com" =sc continue + by dn.regex="^cn=Bjorn Jensen,ou=Information Technology Division,ou=People,d + c=example,dc=com$" +rw stop by * break -access to dn.children="ou=Information Technology Division,ou=People,o=University of Michigan,c=US" - by group/groupOfUniqueNames/uniqueMember.exact="cn=ITD Staff,ou=Groups,o=University of Michigan,c=US" write +access to dn.children="ou=Information Technology Division,ou=People,dc=exampl + e,dc=com" + by group/groupOfUniqueNames/uniqueMember.exact="cn=ITD Staff,ou=Groups,dc=ex + ample,dc=com" write by * read access to filter="(name=X*Y*Z)" diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf index cbf89e197d..2ea53cdced 100644 --- a/tests/data/slapd-cache-master.conf +++ b/tests/data/slapd-cache-master.conf @@ -1,8 +1,9 @@ # master slapd config -- for proxy cache testing -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-cache-master.conf,v 1.2.2.4 2003/12/15 + 22:05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -31,10 +32,9 @@ argsfile ./testrun/slapd.1.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.1.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret index objectClass eq index cn,sn,uid pres,eq,sub - diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf index f1d9b90a89..fbf11502d9 100644 --- a/tests/data/slapd-dnssrv.conf +++ b/tests/data/slapd-dnssrv.conf @@ -1,8 +1,9 @@ # DNS SRV slapd config -- for testing -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-dnssrv.conf,v 1.10.2.2 2003/12/15 22:05 + :29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf index 7f43aa5a66..331b1849ce 100644 --- a/tests/data/slapd-glue.conf +++ b/tests/data/slapd-glue.conf @@ -1,8 +1,9 @@ # stand-alone slapd config -- for backglue testing (with indexing) -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-glue.conf,v 1.5.2.4 2003/12/15 22:05:29 + kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -30,10 +31,10 @@ argsfile ./testrun/slapd.1.args ####################################################################### database @BACKEND@ -suffix "ou=Information Technology Division,ou=People,o=University of Michigan, c=US" +suffix "ou=Information Technology Division,ou=People,dc=example,dc=com" subordinate directory ./testrun/db.1.a -rootdn "cn=Manager, o=University of Michigan, c=US" +rootdn "cn=Manager, dc=example,dc=com" #ldbm#index objectclass eq #ldbm#index uid pres,eq,sub #ldbm#index cn,sn pres,eq,sub,subany @@ -44,10 +45,10 @@ rootdn "cn=Manager, o=University of Michigan, c=US" #bdb#index cn,sn pres,eq,sub,subany database @BACKEND@ -suffix "ou=Groups,o=University of Michigan, c=US" +suffix "ou=Groups,dc=example,dc=com" subordinate directory ./testrun/db.1.b -rootdn "cn=Manager, o=University of Michigan, c=US" +rootdn "cn=Manager, dc=example,dc=com" #ldbm#index objectclass eq #ldbm#index uid pres,eq,sub #ldbm#index cn,sn pres,eq,sub,subany @@ -58,9 +59,9 @@ rootdn "cn=Manager, o=University of Michigan, c=US" #bdb#index cn,sn pres,eq,sub,subany database @BACKEND@ -suffix "o=University of Michigan, c=US" +suffix "dc=example,dc=com" directory ./testrun/db.1.c -rootdn "cn=Manager, o=University of Michigan, c=US" +rootdn "cn=Manager, dc=example,dc=com" rootpw secret #ldbm#index objectclass eq #ldbm#index uid pres,eq,sub diff --git a/tests/data/slapd-limits.conf b/tests/data/slapd-limits.conf index a21b39f6b8..f3b91ac37f 100644 --- a/tests/data/slapd-limits.conf +++ b/tests/data/slapd-limits.conf @@ -31,28 +31,28 @@ argsfile ./testrun/slapd.1.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.1.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #ldbm#index uid eq #bdb#index objectClass eq #bdb#index uid eq -#bdb#limits dn.exact="cn=Unlimited User,ou=Paged Results Users,o=University of Michigan,c=US" size=4 size.pr=none -#bdb#limits dn.exact="cn=Page Size Limited User,ou=Paged Results Users,o=University of Michigan,c=US" size=4 size.pr=4 -#bdb#limits dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,o=University of Michigan,c=US" size=4 size.prtotal=disabled -#bdb#limits dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,o=University of Michigan,c=US" size=4 size.prtotal=10 +#bdb#limits dn.exact="cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=none +#bdb#limits dn.exact="cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=4 +#bdb#limits dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=disabled +#bdb#limits dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=10 -limits dn.exact="cn=Unlimited User,ou=People,o=University of Michigan,c=US" size=none time=none -limits dn.exact="cn=Soft Limited User,ou=People,o=University of Michigan,c=US" size.soft=4 size.hard=none -limits dn.exact="cn=Hard Limited User,ou=People,o=University of Michigan,c=US" size.soft=4 size.hard=8 -limits dn.exact="cn=Unchecked Limited User,ou=People,o=University of Michigan,c=US" size.unchecked=4 -limits group="cn=Unchecked Limited Users,ou=Groups,o=University of Michigan,c=US" size.unchecked=4 -limits dn.regex="^cn=Foo User,ou=[^,]+,o=University of Michigan,c=US$" size.soft=6 -limits dn.onelevel="ou=People,o=University of Michigan,c=US" size.soft=5 -limits dn.children="ou=Groups,o=University of Michigan,c=US" size.soft=4 -limits dn.subtree="ou=Admin,o=University of Michigan,c=US" size.soft=3 +limits dn.exact="cn=Unlimited User,ou=People,dc=example,dc=com" size=none time=none +limits dn.exact="cn=Soft Limited User,ou=People,dc=example,dc=com" size.soft=4 size.hard=none +limits dn.exact="cn=Hard Limited User,ou=People,dc=example,dc=com" size.soft=4 size.hard=8 +limits dn.exact="cn=Unchecked Limited User,ou=People,dc=example,dc=com" size.unchecked=4 +limits group="cn=Unchecked Limited Users,ou=Groups,dc=example,dc=com" size.unchecked=4 +limits dn.regex="^cn=Foo User,ou=[^,]+,dc=example,dc=com$" size.soft=6 +limits dn.onelevel="ou=People,dc=example,dc=com" size.soft=5 +limits dn.children="ou=Groups,dc=example,dc=com" size.soft=4 +limits dn.subtree="ou=Admin,dc=example,dc=com" size.soft=3 limits users size.soft=2 limits anonymous size.soft=1 diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf index 6398468850..9b32232bc7 100644 --- a/tests/data/slapd-master.conf +++ b/tests/data/slapd-master.conf @@ -1,8 +1,9 @@ # master slapd config -- for testing -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-master.conf,v 1.33.2.4 2003/12/15 22:05 + :29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -33,9 +34,9 @@ argsfile ./testrun/slapd.1.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.1.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #bdb#index objectClass eq diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-master.conf index 7408945d1c..8d6440e94a 100644 --- a/tests/data/slapd-nis-master.conf +++ b/tests/data/slapd-nis-master.conf @@ -1,8 +1,9 @@ # master slapd config -- for testing (needs updating) -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-nis-master.conf,v 1.10.2.2 2003/12/15 2 + 2:05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf index 1919b12722..96428c4e32 100644 --- a/tests/data/slapd-passwd.conf +++ b/tests/data/slapd-passwd.conf @@ -1,8 +1,9 @@ # master slapd config -- for testing -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-passwd.conf,v 1.10.2.4 2003/12/15 22:05 + :29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -30,7 +31,7 @@ argsfile ./test-db/slapd.args ####################################################################### database passwd -suffix "o=University of Michigan,c=US" -rootdn "cn=Manager,o=University of Michigan,c=US" +suffix "dc=example,dc=com" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret #file ./data/passwd diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf index 5cb9440147..a9dd242649 100644 --- a/tests/data/slapd-proxycache.conf +++ b/tests/data/slapd-proxycache.conf @@ -1,8 +1,9 @@ # proxy cache slapd config -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-proxycache.conf,v 1.6.2.4 2003/12/15 22 + :05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -33,8 +34,8 @@ argsfile ./testrun/slapd.2.args ####################################################################### database ldap -suffix "o=University of Michigan,c=US" -rootdn "o=University of Michigan,c=US" +suffix "dc=example,dc=com" +rootdn "dc=example,dc=com" uri ldap://127.0.0.1:9011/o=University%20of%20Michigan%2cc=US overlay proxycache diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf index 3d15462277..d9ab0c9115 100644 --- a/tests/data/slapd-pw.conf +++ b/tests/data/slapd-pw.conf @@ -1,8 +1,9 @@ # master slapd config -- for testing -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-pw.conf,v 1.19.2.4 2003/12/15 22:05:29 + kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -33,9 +34,9 @@ argsfile ./testrun/slapd.1.args database @BACKEND@ #ldbm#cachesize 0 -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.1.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret index objectClass eq index cn,sn,uid pres,eq,sub diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf index 40f39c743f..15349758fe 100644 --- a/tests/data/slapd-ref-slave.conf +++ b/tests/data/slapd-ref-slave.conf @@ -1,8 +1,9 @@ # slave slapd config -- for default referral testing -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-ref-slave.conf,v 1.25.2.4 2003/12/15 22 + :05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf index f3929490d0..1563d2dc5d 100644 --- a/tests/data/slapd-referrals.conf +++ b/tests/data/slapd-referrals.conf @@ -1,8 +1,9 @@ # referral slapd config -- for testing -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-referrals.conf,v 1.2.2.4 2003/12/15 22: + 05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -30,9 +31,9 @@ argsfile ./testrun/slapd.args ####################################################################### database @BACKEND@ -suffix "c=US" +suffix "c=us" directory ./testrun/db.1.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,c=us" rootpw secret #ldbm#index objectClass eq #bdb#index objectClass eq diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf index d1aa1ae47d..38a79c6191 100644 --- a/tests/data/slapd-repl-master.conf +++ b/tests/data/slapd-repl-master.conf @@ -1,8 +1,9 @@ # master slapd config -- for testing of replication -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-repl-master.conf,v 1.27.2.4 2003/12/15 + 22:05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -32,9 +33,9 @@ argsfile ./testrun/slapd.1.args database @BACKEND@ #ldbm#cachesize 0 -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.1.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub @@ -44,6 +45,6 @@ rootpw secret replogfile ./testrun/slapd.1.replog replica host=localhost:9012 - binddn="cn=Replica,o=University of Michigan,c=US" + binddn="cn=Replica,dc=example,dc=com" bindmethod=simple credentials=secret diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf index 84488fd59d..fed4366eff 100644 --- a/tests/data/slapd-repl-slave.conf +++ b/tests/data/slapd-repl-slave.conf @@ -1,8 +1,9 @@ # slave slapd config -- for testing of replication -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-repl-slave.conf,v 1.31.2.4 2003/12/15 2 + 2:05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -32,11 +33,11 @@ argsfile ./testrun/slapd.2.args database @BACKEND@ #ldbm#cachesize 0 -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.2.a -rootdn "cn=Replica,o=University of Michigan,c=US" +rootdn "cn=Replica,dc=example,dc=com" rootpw secret -updatedn "cn=Replica,o=University of Michigan,c=US" +updatedn "cn=Replica,dc=example,dc=com" updateref "ldap://localhost:9010" #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf index 58846fe431..008dc2f347 100644 --- a/tests/data/slapd-schema.conf +++ b/tests/data/slapd-schema.conf @@ -1,8 +1,9 @@ # stand-alone slapd config -- for testing (with indexing) -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-schema.conf,v 1.20.2.4 2003/12/15 22:05 + :29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -25,8 +26,6 @@ include ./schema/misc.schema include ./schema/nis.schema include ./schema/openldap.schema # -include ./schema/collective.schema -# pidfile ./testrun/slapd.1.pid argsfile ./testrun/slapd.1.args diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf index 324dac171b..16b03ea9fe 100644 --- a/tests/data/slapd-syncrepl-master.conf +++ b/tests/data/slapd-syncrepl-master.conf @@ -1,8 +1,9 @@ # master slapd config -- for testing of SYNC replication -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-master.conf,v 1.1.2.4 2003/12/ + 15 22:05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -31,9 +32,9 @@ argsfile ./testrun/slapd.1.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.1.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf index 6179835f4e..f0331615d2 100644 --- a/tests/data/slapd-syncrepl-slave-persist1.conf +++ b/tests/data/slapd-syncrepl-slave-persist1.conf @@ -1,8 +1,9 @@ # slave slapd config -- for testing of SYNC replication -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-slave-persist1.conf,v 1.4.2.4 + 2003/12/15 22:05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -31,9 +32,9 @@ argsfile ./testrun/slapd.4.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.4.a -rootdn "cn=Replica,o=University of Michigan,c=US" +rootdn "cn=Replica,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub @@ -43,11 +44,11 @@ rootpw secret # Don't change syncrepl spec yet syncrepl rid=1 provider=ldap://localhost:9011 - updatedn="cn=Replica,o=University of Michigan,c=US" - binddn="cn=Manager,o=University of Michigan,c=US" + updatedn="cn=Replica,dc=example,dc=com" + binddn="cn=Manager,dc=example,dc=com" bindmethod=simple credentials=secret - searchbase="o=University of Michigan,c=US" + searchbase="dc=example,dc=com" filter="(objectClass=*)" attrs="*" schemachecking=off diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf index d0d80058f8..27dbf23e5b 100644 --- a/tests/data/slapd-syncrepl-slave-persist2.conf +++ b/tests/data/slapd-syncrepl-slave-persist2.conf @@ -1,5 +1,6 @@ # slave slapd config -- for testing of SYNC replication -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-slave-persist2.conf,v 1.4.2.4 + 2003/12/15 22:05:29 kurt Exp $ ucdata-path ./ucdata include ./schema/core.schema @@ -19,9 +20,9 @@ argsfile ./testrun/slapd.5.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.5.a -rootdn "cn=Replica,o=University of Michigan,c=US" +rootdn "cn=Replica,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub @@ -31,11 +32,11 @@ rootpw secret # Don't change syncrepl spec yet syncrepl rid=1 provider=ldap://localhost:9014 - updatedn="cn=Replica,o=University of Michigan,c=US" - binddn="cn=Replica,o=University of Michigan,c=US" + updatedn="cn=Replica,dc=example,dc=com" + binddn="cn=Replica,dc=example,dc=com" bindmethod=simple credentials=secret - searchbase="o=University of Michigan,c=US" + searchbase="dc=example,dc=com" filter="(objectClass=*)" attrs="*" schemachecking=off diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf index 6f6454f2c5..0c126cc4eb 100644 --- a/tests/data/slapd-syncrepl-slave-persist3.conf +++ b/tests/data/slapd-syncrepl-slave-persist3.conf @@ -1,8 +1,9 @@ # slave slapd config -- for testing of SYNC replication -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-slave-persist3.conf,v 1.4.2.4 + 2003/12/15 22:05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -31,9 +32,9 @@ argsfile ./testrun/slapd.6.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.6.a -rootdn "cn=Replica,o=University of Michigan,c=US" +rootdn "cn=Replica,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub @@ -43,11 +44,11 @@ rootpw secret # Don't change syncrepl spec yet syncrepl rid=1 provider=ldap://localhost:9011 - updatedn="cn=Replica,o=University of Michigan,c=US" - binddn="cn=Manager,o=University of Michigan,c=US" + updatedn="cn=Replica,dc=example,dc=com" + binddn="cn=Manager,dc=example,dc=com" bindmethod=simple credentials=secret - searchbase="o=University of Michigan,c=US" + searchbase="dc=example,dc=com" filter="(objectClass=*)" attrs="*" schemachecking=off diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf index 6c17ad65e7..58be2dbbb4 100644 --- a/tests/data/slapd-syncrepl-slave-refresh1.conf +++ b/tests/data/slapd-syncrepl-slave-refresh1.conf @@ -1,8 +1,9 @@ # slave slapd config -- for testing of SYNC replication -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-slave-refresh1.conf,v 1.5.2.4 + 2003/12/15 22:05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -31,9 +32,9 @@ argsfile ./testrun/slapd.2.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.2.a -rootdn "cn=Replica,o=University of Michigan,c=US" +rootdn "cn=Replica,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub @@ -45,11 +46,11 @@ sessionlog 1 100 # Don't change syncrepl spec yet syncrepl rid=1 provider=ldap://localhost:9011 - updatedn="cn=Replica,o=University of Michigan,c=US" - binddn="cn=Manager,o=University of Michigan,c=US" + updatedn="cn=Replica,dc=example,dc=com" + binddn="cn=Manager,dc=example,dc=com" bindmethod=simple credentials=secret - searchbase="o=University of Michigan,c=US" + searchbase="dc=example,dc=com" filter="(objectClass=*)" attrs="*" schemachecking=off diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf index 0f7c9735cc..ec0516b490 100644 --- a/tests/data/slapd-syncrepl-slave-refresh2.conf +++ b/tests/data/slapd-syncrepl-slave-refresh2.conf @@ -1,8 +1,9 @@ # slave slapd config -- for testing of SYNC replication -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-slave-refresh2.conf,v 1.5.2.4 + 2003/12/15 22:05:29 kurt Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -31,9 +32,9 @@ argsfile ./testrun/slapd.3.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.3.a -rootdn "cn=Replica,o=University of Michigan,c=US" +rootdn "cn=Replica,dc=example,dc=com" rootpw secret #ldbm#index objectClass eq #ldbm#index cn,sn,uid pres,eq,sub @@ -43,11 +44,11 @@ rootpw secret # Don't change syncrepl spec yet syncrepl rid=1 provider=ldap://localhost:9012 - updatedn="cn=Replica,o=University of Michigan,c=US" - binddn="cn=Replica,o=University of Michigan,c=US" + updatedn="cn=Replica,dc=example,dc=com" + binddn="cn=Replica,dc=example,dc=com" bindmethod=simple credentials=secret - searchbase="o=University of Michigan,c=US" + searchbase="dc=example,dc=com" filter="(objectClass=*)" attrs="*" schemachecking=off diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf index dfd7a8fb13..af1c350527 100644 --- a/tests/data/slapd.conf +++ b/tests/data/slapd.conf @@ -32,9 +32,9 @@ argsfile ./testrun/slapd.1.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.1.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret index objectClass eq index cn,sn,uid pres,eq,sub diff --git a/tests/data/slapd2.conf b/tests/data/slapd2.conf index 89159c0efb..70fff3e261 100644 --- a/tests/data/slapd2.conf +++ b/tests/data/slapd2.conf @@ -1,8 +1,9 @@ # stand-alone slapd config -- for testing (with indexing) -# $OpenLDAP$ +# $OpenLDAP: pkg/ldap/tests/data/slapd2.conf,v 1.2.2.3 2003/12/15 22:05:29 kur + t Exp $ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2003 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -31,10 +32,9 @@ argsfile ./testrun/slapd.2.args ####################################################################### database @BACKEND@ -suffix "o=University of Michigan,c=US" +suffix "dc=example,dc=com" directory ./testrun/db.2.a -rootdn "cn=Manager,o=University of Michigan,c=US" +rootdn "cn=Manager,dc=example,dc=com" rootpw secret index objectClass eq index cn,sn,uid pres,eq,sub - diff --git a/tests/data/test-glued.ldif b/tests/data/test-glued.ldif index 14b9d36ddb..7b6f721e13 100644 --- a/tests/data/test-glued.ldif +++ b/tests/data/test-glued.ldif @@ -1,60 +1,60 @@ -dn: o=University of Michigan,c=US +dn: dc=example,dc=com +objectClass: top objectClass: organization objectClass: domainRelatedObject -l: Ann Arbor, Michigan +objectClass: dcObject +dc: example +l: Anytown, Michigan st: Michigan -o: University of Michigan +o: Example, Inc. o: UMICH o: UM o: U-M o: U of M -description: The University of Michigan at Ann Arbor -postalAddress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US telephoneNumber: +1 313 764-1817 associatedDomain: example.com -dn: ou=People,o=University of Michigan,c=US +dn: ou=People,dc=example,dc=com objectClass: organizationalUnit objectClass: extensibleObject ou: People uidNumber: 0 gidNumber: 0 -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: ou=Alumni Association,ou=People,dc=example,dc=com objectClass: organizationalUnit ou: Alumni Association -dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Lemonade -homePostalAddress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 +homePostalAddress: 377 White St. Apt. 3 $ Anytown, MI 48104 description: Very tall facsimileTelephoneNumber: +1 313 555 3223 telephoneNumber: +1 313 555 3664 mail: dots@mail.alumni.example.com homePhone: +1 313 555 0454 -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com userPassword:: amFq -homePostalAddress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association @@ -63,16 +63,16 @@ mail: jaj@mail.alumni.example.com 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 +dn: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homePostalAddress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 drink: diet coke description: Enthusiastic mail: jdoe@woof.net @@ -81,17 +81,16 @@ pager: +1 313 555 1220 facsimileTelephoneNumber: +1 313 555 2311 telephoneNumber: +1 313 555 4774 -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homePostalAddress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homePostalAddress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com homePhone: +1 313 555 2333 @@ -99,7 +98,7 @@ pager: +1 313 555 6442 facsimileTelephoneNumber: +1 313 555 2756 telephoneNumber: +1 313 555 8232 -dn: cn=Manager,o=University of Michigan,c=US +dn: cn=Manager,dc=example,dc=com objectClass: person cn: Manager cn: Directory Manager @@ -108,15 +107,14 @@ sn: Manager description: Manager of the directory userPassword:: c2VjcmV0 -dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= - US +dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com homePostalAddress: 199 Outer Drive $ Ypsilanti, MI 48198 homePhone: +1 313 555 0388 drink: Gasoline @@ -126,23 +124,22 @@ pager: +1 313 555 7671 facsimileTelephoneNumber: +1 313 555 7762 telephoneNumber: +1 313 555 4177 -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homePostalAddress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com homePhone: +1 313 555 8421 pager: +1 313 555 2844 facsimileTelephoneNumber: +1 313 555 9700 telephoneNumber: +1 313 555 5331 -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US +dn: ou=Information Technology Division,ou=People,dc=example,dc=com objectClass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD @@ -285,20 +282,20 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit - y of Michigan,c=US +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com objectClass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 +postalAddress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com userPassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com -homePostalAddress: 123 Wesley $ Ann Arbor, MI 48103 +homePostalAddress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water homePhone: +1 313 555 2333 @@ -306,55 +303,54 @@ pager: +1 313 555 3233 facsimileTelephoneNumber: +1 313 555 2274 telephoneNumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com objectClass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen uid: bjorn -seeAlso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com userPassword:: Ympvcm4= homePostalAddress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea description: Hiker, biker title: Director, Embedded Systems -postalAddress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com homePhone: +1 313 555 5444 pager: +1 313 555 4474 facsimileTelephoneNumber: +1 313 555 2177 telephoneNumber: +1 313 555 0355 -dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Universi - ty of Michigan,c=US +dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=example + ,dc=com objectClass: OpenLDAPperson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe uid: jjones -seeAlso: cn=All Staff,ou=Groups,o=University of Michigan,c=US -homePostalAddress: 933 Brooks $ Ann Arbor, MI 48104 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 933 Brooks $ Anytown, MI 48104 homePhone: +1 313 555 8838 title: Senior Manager, Information Technology Division description: Not around very much mail: jjones@mailgw.example.com -postalAddress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W William $ Anytown, MI 48103 pager: +1 313 555 2833 facsimileTelephoneNumber: +1 313 555 8688 telephoneNumber: +1 313 555 7334 -dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M - ichigan,c=US +dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com 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 -homePostalAddress: 912 East Bllvd $ Ann Arbor, MI 48104 +postalAddress: ITD $ 535 W. William $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 912 East Bllvd $ Anytown, MI 48104 title: System Administrator, Information Technology Division description: overworked! mail: johnd@mailgw.example.com @@ -363,66 +359,54 @@ pager: +1 313 555 6573 facsimileTelephoneNumber: +1 313 555 4544 telephoneNumber: +1 313 555 9394 -dn: ou=Groups,o=University of Michigan,c=US +dn: ou=Groups,dc=example,dc=com objectClass: organizationalUnit ou: Groups -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com cn: All Staff description: Everyone in the sample data -objectClass: groupofnames +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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff -objectClass: groupofnames +objectClass: groupOfNames -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff -objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US -uniquemember: cn=Bjorn Jensen,OU=Information Technology Division,ou=PEOPLE,o=U - niversity of Michigan,c=US -uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=PEOPLE, - o=University of Michigan,c=US -uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US +objectClass: groupOfUniqueNames +uniqueMember: cn=Manager,dc=example,dc=com +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= + example,dc=com +uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=People, + dc=example,dc=com +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com diff --git a/tests/data/test-lang.ldif b/tests/data/test-lang.ldif index f108b06949..62ca2f05f2 100644 --- a/tests/data/test-lang.ldif +++ b/tests/data/test-lang.ldif @@ -1,12 +1,13 @@ -dn: o=University of Michigan,c=US +dn: dc=example,dc=com +objectclass: dcobject +dc: example objectClass: organization objectClass: extensibleObject -o: University of Michigan -o;lang-zz;lang-y;lang-yy;lang-xx;lang-x;lang-z: University of Michigan +o: Example, Inc. +o;lang-zz;lang-y;lang-yy;lang-xx;lang-x;lang-z: Example, Inc. name;lang-en-US: Billy Ray name;lang-en-US: Billy Bob CN;lang-en-US: Billy Ray name: Billy Ray SN;lang-en-US;lang-en-GB: Billy Ray SN: Ray - diff --git a/tests/data/test-limits.ldif b/tests/data/test-limits.ldif index 330e2273ed..40a6fee647 100644 --- a/tests/data/test-limits.ldif +++ b/tests/data/test-limits.ldif @@ -1,10 +1,14 @@ #LEAD COMMENT -dn: o=University of Michigan,c=US +dn: dc=example,dc=com #EMBEDDED COMMENT +objectclass: top objectclass: organization objectclass: domainRelatedObject +objectclass: dcobject +dc: example l: Ann Arbor, Michigan st: Michigan +o: Example, Inc. o: University of Michigan o: UMICH o: UM @@ -16,121 +20,121 @@ postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 telephonenumber: +1 313 764-1817 associateddomain: example.com -dn: ou=People,o=University of Michigan,c=US +dn: ou=People,dc=example,dc=com objectclass: organizationalUnit ou: People -dn: cn=Unlimited User,ou=People,o=University of Michigan,c=US +dn: cn=Unlimited User,ou=People,dc=example,dc=com objectclass: OpenLDAPperson cn: Unlimited User sn: User uid: unlimited userpassword:: c2VjcmV0 -dn: cn=Soft Limited User,ou=People,o=University of Michigan,c=US +dn: cn=Soft Limited User,ou=People,dc=example,dc=com objectclass: OpenLDAPperson cn: Soft Limited User sn: User uid: softlimited userpassword:: c2VjcmV0 -dn: cn=Hard Limited User,ou=People,o=University of Michigan,c=US +dn: cn=Hard Limited User,ou=People,dc=example,dc=com objectclass: OpenLDAPperson cn: Hard Limited User sn: User uid: hardlimited userpassword:: c2VjcmV0 -dn: cn=Unchecked Limited User,ou=People,o=University of Michigan,c=US +dn: cn=Unchecked Limited User,ou=People,dc=example,dc=com objectclass: OpenLDAPperson cn: Unchecked Limited User sn: User uid: uncheckedlimited userpassword:: c2VjcmV0 -dn: cn=Other User,ou=People,o=University of Michigan,c=US +dn: cn=Other User,ou=People,dc=example,dc=com objectclass: OpenLDAPperson cn: Other User sn: User uid: other userpassword:: c2VjcmV0 -dn: cn=Foo User,ou=People,o=University of Michigan,c=US +dn: cn=Foo User,ou=People,dc=example,dc=com objectclass: OpenLDAPperson cn: Foo User sn: User uid: foo userpassword:: c2VjcmV0 -dn: cn=Bar User,ou=People,o=University of Michigan,c=US +dn: cn=Bar User,ou=People,dc=example,dc=com objectclass: OpenLDAPperson cn: Bar User sn: User uid: bar userpassword:: c2VjcmV0 -dn: cn=Unchecked Limited User 2,ou=People,o=University of Michigan,c=US +dn: cn=Unchecked Limited User 2,ou=People,dc=example,dc=com objectclass: OpenLDAPperson cn: Unchecked Limited User 2 sn: User 2 uid: uncheckedlimited2 userpassword:: c2VjcmV0 -dn: ou=Groups,o=University of Michigan,c=US +dn: ou=Groups,dc=example,dc=com objectclass: organizationalUnit ou: Groups -dn: cn=Unchecked Limited Users,ou=Groups,o=University of Michigan,c=US +dn: cn=Unchecked Limited Users,ou=Groups,dc=example,dc=com objectClass: groupOfNames objectClass: simpleSecurityObject cn: Unchecked Limited Users userpassword:: c2VjcmV0 -member: cn=Unchecked Limited User 2,ou=People,o=University of Michigan,c=US +member: cn=Unchecked Limited User 2,ou=People,dc=example,dc=com -dn: ou=Admin,o=University of Michigan,c=US +dn: ou=Admin,dc=example,dc=com objectclass: organizationalUnit ou: Admin -dn: cn=Unchecked Limited User 3,ou=Admin,o=University of Michigan,c=US +dn: cn=Unchecked Limited User 3,ou=Admin,dc=example,dc=com objectclass: OpenLDAPperson cn: Unchecked Limited User 3 sn: User 3 uid: uncheckedlimited3 userpassword:: c2VjcmV0 -dn: cn=Special User,o=University of Michigan,c=US +dn: cn=Special User,dc=example,dc=com objectclass: OpenLDAPperson cn: Special User sn: User uid: special userpassword:: c2VjcmV0 -dn: ou=Paged Results Users,o=University of Michigan,c=US +dn: ou=Paged Results Users,dc=example,dc=com objectclass: organizationalUnit ou: Paged Results Users -dn: cn=Unlimited User,ou=Paged Results Users,o=University of Michigan,c=US +dn: cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com objectclass: OpenLDAPperson cn: Unlimited User sn: User uid: unlimited userpassword:: c2VjcmV0 -dn: cn=Page Size Limited User,ou=Paged Results Users,o=University of Michigan,c=US +dn: cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com objectclass: OpenLDAPperson cn: Page Size Limited User sn: User uid: pagesizelimited userpassword:: c2VjcmV0 -dn: cn=Paged Results Disabled User,ou=Paged Results Users,o=University of Michigan,c=US +dn: cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com objectclass: OpenLDAPperson cn: Paged Results Disabled User sn: User uid: pagedresultsdisabled userpassword:: c2VjcmV0 -dn: cn=Paged Results Limited User,ou=Paged Results Users,o=University of Michigan,c=US +dn: cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com objectclass: OpenLDAPperson cn: Paged Results Limited User sn: User diff --git a/tests/data/test-ordered-cp.ldif b/tests/data/test-ordered-cp.ldif index 3cbe2ec327..8bce1094b4 100644 --- a/tests/data/test-ordered-cp.ldif +++ b/tests/data/test-ordered-cp.ldif @@ -1,17 +1,18 @@ #LEAD COMMENT -dn: o=University of Michigan,c=US +dn: dc=example,dc=com +objectclass: dcobject +dc: example #EMBEDDED COMMENT objectclass: organization objectclass: domainRelatedObject -l: Ann Arbor, Michigan +l: Anytown, Michigan st: Michigan -o: University of Michigan +o: Example, Inc. o: UMICH o: UM o: U-M o: U of M -description: The University of Michigan at Ann Arbor -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US +description: The Example, Inc. at Anytown +postaladdress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US telephonenumber: +1 313 764-1817 associateddomain: example.com diff --git a/tests/data/test-ordered-nocp.ldif b/tests/data/test-ordered-nocp.ldif index b53fec6cd3..be2b556dfa 100644 --- a/tests/data/test-ordered-nocp.ldif +++ b/tests/data/test-ordered-nocp.ldif @@ -1,19 +1,18 @@ #LEAD COMMENT -dn: ou=People,o=University of Michigan,c=US +dn: ou=People,dc=example,dc=com #EMBEDDED COMMENT objectclass: organizationalUnit ou: People -dn: ou=Groups,o=University of Michigan,c=US +dn: ou=Groups,dc=example,dc=com objectclass: organizationalUnit ou: Groups -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: ou=Alumni Association,ou=People,dc=example,dc=com objectclass: organizationalUnit ou: Alumni Association -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c - =US +dn: ou=Information Technology Division,ou=People,dc=example,dc=com objectclass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD @@ -156,66 +155,54 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com 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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff objectclass: groupofnames -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Univer - sity of Michigan,c=US +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 +postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com userpassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com -homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 +homepostaladdress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 @@ -223,69 +210,67 @@ pager: +1 313 555 3233 facsimiletelephonenumber: +1 313 555 2274 telephonenumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Universi - ty of Michigan,c=US +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen uid: bjorn -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,dc=example,dc=com userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea description: Hiker, biker title: Director, Embedded Systems -postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 +postaladdress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com homephone: +1 313 555 5444 pager: +1 313 555 4474 facsimiletelephonenumber: +1 313 555 2177 telephonenumber: +1 313 555 0355 -dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US +dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Lemonade -homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 +homepostaladdress: 377 White St. Apt. 3 $ Anytown, MI 48104 description: Very tall facsimiletelephonenumber: +1 313 555 3223 telephonenumber: +1 313 555 3664 mail: dots@mail.alumni.example.com homephone: +1 313 555 0454 -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US -uniquemember: cn=Bjorn Jensen,OU=Information Technology Division,ou=PEOPLE,o=U - niversity of Michigan,c=US -uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=PEOPLE, - o=University of Michigan,c=US -uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US +uniquemember: cn=Manager,dc=example,dc=com +uniquemember: cn=Bjorn Jensen,OU=Information Technology Division,ou=People,dc= + example,dc=com +uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=People, + dc=example,dc=com +uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 +homepostaladdress: 3882 Beverly Rd. $ Anytown, MI 48105 homephone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association @@ -294,36 +279,35 @@ mail: jaj@mail.alumni.example.com facsimiletelephonenumber: +1 313 555 4332 telephonenumber: +1 313 555 0895 -dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US +dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=example + ,dc=com objectclass: OpenLDAPperson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe uid: jjones -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US -homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 933 Brooks $ Anytown, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division description: Not around very much mail: jjones@mailgw.example.com -postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 +postaladdress: Info Tech Division $ 535 W William $ Anytown, MI 48103 pager: +1 313 555 2833 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 +dn: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 123 Anystreet $ Anytown, MI 48104 drink: diet coke description: Enthusiastic mail: jdoe@woof.net @@ -332,17 +316,16 @@ pager: +1 313 555 1220 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 +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homepostaladdress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com homephone: +1 313 555 2333 @@ -350,16 +333,15 @@ pager: +1 313 555 6442 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 +dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com 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 -homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 +postaladdress: ITD $ 535 W. William $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 912 East Bllvd $ Anytown, MI 48104 title: System Administrator, Information Technology Division description: overworked! mail: johnd@mailgw.example.com @@ -368,7 +350,7 @@ pager: +1 313 555 6573 facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 -dn: cn=Manager,o=University of Michigan,c=US +dn: cn=Manager,dc=example,dc=com objectclass: person cn: Manager cn: Directory Manager @@ -377,15 +359,14 @@ sn: Manager description: Manager of the directory userpassword:: c2VjcmV0 -dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US +dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 homephone: +1 313 555 0388 drink: Gasoline @@ -395,19 +376,17 @@ pager: +1 313 555 7671 facsimiletelephonenumber: +1 313 555 7762 telephonenumber: +1 313 555 4177 -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com homephone: +1 313 555 8421 pager: +1 313 555 2844 facsimiletelephonenumber: +1 313 555 9700 telephonenumber: +1 313 555 5331 - diff --git a/tests/data/test-ordered.ldif b/tests/data/test-ordered.ldif index a852e442d0..0199333837 100644 --- a/tests/data/test-ordered.ldif +++ b/tests/data/test-ordered.ldif @@ -1,38 +1,39 @@ #LEAD COMMENT -dn: o=University of Michigan,c=US +dn: dc=example,dc=com #EMBEDDED COMMENT +objectclass: top objectclass: organization objectclass: domainRelatedObject -l: Ann Arbor, Michigan +objectclass: dcobject +dc: example +l: Anytown, Michigan st: Michigan -o: University of Michigan +o: Example, Inc. o: UMICH o: UM o: U-M o: U of M -description: The University of Michigan at Ann Arbor -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US +description: The Example, Inc. at Anytown +postaladdress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US telephonenumber: +1 313 764-1817 associateddomain: example.com -dn: ou=People,o=University of Michigan,c=US +dn: ou=People,dc=example,dc=com objectclass: organizationalUnit objectclass: extensibleObject ou: People uidNumber: 0 gidNumber: 0 -dn: ou=Groups,o=University of Michigan,c=US +dn: ou=Groups,dc=example,dc=com objectclass: organizationalUnit ou: Groups -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: ou=Alumni Association,ou=People,dc=example,dc=com objectclass: organizationalUnit ou: Alumni Association -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c - =US +dn: ou=Information Technology Division,ou=People,dc=example,dc=com objectclass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD @@ -175,66 +176,54 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -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=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 +dn: cn=All Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com 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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff objectclass: groupofnames -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Univer - sity of Michigan,c=US +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com objectclass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 +postaladdress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com userpassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com -homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 +homepostaladdress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water homephone: +1 313 555 2333 @@ -242,69 +231,67 @@ pager: +1 313 555 3233 facsimiletelephonenumber: +1 313 555 2274 telephonenumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Universi - ty of Michigan,c=US +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com objectclass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen uid: bjorn -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US +seealso: cn=All Staff,ou=Groups,dc=example,dc=com userpassword:: Ympvcm4= homepostaladdress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea description: Hiker, biker title: Director, Embedded Systems -postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 +postaladdress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com homephone: +1 313 555 5444 pager: +1 313 555 4474 facsimiletelephonenumber: +1 313 555 2177 telephonenumber: +1 313 555 0355 -dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US +dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Lemonade -homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 +homepostaladdress: 377 White St. Apt. 3 $ Anytown, MI 48104 description: Very tall facsimiletelephonenumber: +1 313 555 3223 telephonenumber: +1 313 555 3664 mail: dots@mail.alumni.example.com homephone: +1 313 555 0454 -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US -uniquemember: cn=Bjorn Jensen,OU=Information Technology Division,ou=PEOPLE,o=U - niversity of Michigan,c=US -uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=PEOPLE, - o=University of Michigan,c=US -uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US +uniquemember: cn=Manager,dc=example,dc=com +uniquemember: cn=Bjorn Jensen,OU=Information Technology Division,ou=People,dc= + example,dc=com +uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=People, + dc=example,dc=com +uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 +homepostaladdress: 3882 Beverly Rd. $ Anytown, MI 48105 homephone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association @@ -313,36 +300,35 @@ mail: jaj@mail.alumni.example.com facsimiletelephonenumber: +1 313 555 4332 telephonenumber: +1 313 555 0895 -dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US +dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=example + ,dc=com objectclass: OpenLDAPperson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe uid: jjones -seealso: cn=All Staff,ou=Groups,o=University of Michigan,c=US -homepostaladdress: 933 Brooks $ Ann Arbor, MI 48104 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 933 Brooks $ Anytown, MI 48104 homephone: +1 313 555 8838 title: Senior Manager, Information Technology Division description: Not around very much mail: jjones@mailgw.example.com -postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 +postaladdress: Info Tech Division $ 535 W William $ Anytown, MI 48103 pager: +1 313 555 2833 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 +dn: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 123 Anystreet $ Anytown, MI 48104 drink: diet coke description: Enthusiastic mail: jdoe@woof.net @@ -351,17 +337,16 @@ pager: +1 313 555 1220 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 +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homepostaladdress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com homephone: +1 313 555 2333 @@ -369,16 +354,15 @@ pager: +1 313 555 6442 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 +dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com 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 -homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 +postaladdress: ITD $ 535 W. William $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 912 East Bllvd $ Anytown, MI 48104 title: System Administrator, Information Technology Division description: overworked! mail: johnd@mailgw.example.com @@ -387,7 +371,7 @@ pager: +1 313 555 6573 facsimiletelephonenumber: +1 313 555 4544 telephonenumber: +1 313 555 9394 -dn: cn=Manager,o=University of Michigan,c=US +dn: cn=Manager,dc=example,dc=com objectclass: person cn: Manager cn: Directory Manager @@ -396,15 +380,14 @@ sn: Manager description: Manager of the directory userpassword:: c2VjcmV0 -dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US +dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com 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 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 homephone: +1 313 555 0388 drink: Gasoline @@ -414,19 +397,17 @@ pager: +1 313 555 7671 facsimiletelephonenumber: +1 313 555 7762 telephonenumber: +1 313 555 4177 -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich - igan,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com 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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postaladdress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com +homepostaladdress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com homephone: +1 313 555 8421 pager: +1 313 555 2844 facsimiletelephonenumber: +1 313 555 9700 telephonenumber: +1 313 555 5331 - diff --git a/tests/data/test.ldif b/tests/data/test.ldif index e596a68b75..ae821d4bed 100644 --- a/tests/data/test.ldif +++ b/tests/data/test.ldif @@ -1,120 +1,125 @@ #LEAD COMMENT -dn: CN=All Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=All Staff,ou=Groups,dc=example,dc=com #EMBEDDED COMMENT -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 +member: cn=Manager,dc=example,dc=com +member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc + =com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa + mple,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl + e,dc=com +owner: cn=Manager,dc=example,dc=com cn: All Staff description: Everyone in the sample data -objectclass: groupofnames +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 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 +dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com +member: cn=Manager,dc=example,dc=com +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All Alumni Assoc Staff cn: Alumni Assoc Staff -objectclass: groupofnames +objectClass: groupOfNames -dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Alumni Association,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Alumni Association -dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Universit - y of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example, + dc=com +objectClass: OpenLDAPperson cn: Barbara Jensen cn: Babs Jensen sn:: IEplbnNlbiA= 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 -userpassword:: YmplbnNlbg== +postalAddress: ITD Prod Dev & Deployment $ 535 W. William St. Room 4212 $ Anyt + own, MI 48103-4943 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: YmplbnNlbg== mail: bjensen@mailgw.example.com -homepostaladdress: 123 Wesley $ Ann Arbor, MI 48103 +homePostalAddress: 123 Wesley $ Anytown, MI 48103 description: Mythical manager of the rsdd unix project drink: water -homephone: +1 313 555 2333 +homePhone: +1 313 555 2333 pager: +1 313 555 3233 -facsimiletelephonenumber: +1 313 555 2274 -telephonenumber: +1 313 555 9022 +facsimileTelephoneNumber: +1 313 555 2274 +telephoneNumber: +1 313 555 9022 -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University - of Michigan,c=US -objectclass: OpenLDAPperson +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc + =com +objectClass: OpenLDAPperson cn: Bjorn Jensen cn: Biiff Jensen sn: Jensen 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 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: Ympvcm4= +homePostalAddress: 19923 Seven Mile Rd. $ South Lyon, MI 49999 drink: Iced Tea description: Hiker, biker title: Director, Embedded Systems -postaladdress: Info Tech Division $ 535 W. William St. $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W. William St. $ Anytown, MI 48103 mail: bjorn@mailgw.example.com -homephone: +1 313 555 5444 +homePhone: +1 313 555 5444 pager: +1 313 555 4474 -facsimiletelephonenumber: +1 313 555 2177 -telephonenumber: +1 313 555 0355 +facsimileTelephoneNumber: +1 313 555 2177 +telephoneNumber: +1 313 555 0355 -dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com +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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Lemonade -homepostaladdress: 377 White St. Apt. 3 $ Ann Arbor, MI 48104 +homePostalAddress: 377 White St. Apt. 3 $ Anytown, MI 48104 description: Very tall -facsimiletelephonenumber: +1 313 555 3223 -telephonenumber: +1 313 555 3664 +facsimileTelephoneNumber: +1 313 555 3223 +telephoneNumber: +1 313 555 3664 mail: dots@mail.alumni.example.com -homephone: +1 313 555 0454 +homePhone: +1 313 555 0454 -dn: ou=Groups,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: dc=example,dc=com +objectClass: top +objectClass: organization +objectClass: domainRelatedObject +objectClass: dcObject +dc: example +l: Anytown, Michigan +st: Michigan +o: Example, Inc. +o: UMICH +o: UM +o: U-M +o: U of M +description: The Example, Inc. at Anytown +postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US +telephoneNumber: +1 313 764-1817 +associatedDomain: example.com + +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit ou: Groups -dn: ou=Information Technology Division,ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit +dn: ou=Information Technology Division,ou=People,dc=example,dc=com +objectClass: organizationalUnit ou: Information Technology Division description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD woLDgsKKT8ODwoPDgsKDw4PCgsOCwqs6w4PCg8OCwoLDg8KCw4LCjUQkw4PCg8OCwoLDg8KCw4LCi @@ -256,175 +261,154 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC 8ODwoLDgsKow4PCg8OCwoPDg8KCw4LCl8ODwoPDgsKDw4PCgsOCwrtWw4PCg8OCwoLDg8KCw4LCi8 ODwoPDgsKDw4PCgsOCwo3Dg8KDw4LCg8ODwoLDgsKow4PCg8OCwoLDg8KCw4LCnw== -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US -owner: cn=Manager,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com +owner: cn=Manager,dc=example,dc=com description: All ITD Staff cn: ITD Staff -objectclass: groupofuniquenames -uniquemember: cn=Manager,o=University of Michigan,c=US -uniquemember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=U - niversity of Michigan,c=US -uniquemember: cn=James A Jones 2,ou=Information Technology Division,ou=People, - o=University of Michigan,c=US -uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=Unive - rsity of Michigan,c=US +objectClass: groupOfUniqueNames +uniqueMember: cn=Manager,dc=example,dc=com +uniqueMember: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc= + example,dc=com +uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=People, + dc=example,dc=com +uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam + ple,dc=com -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com +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 -userpassword:: amFq -homepostaladdress: 3882 Beverly Rd. $ Ann Arbor, MI 48105 -homephone: +1 313 555 4772 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +userPassword:: amFq +homePostalAddress: 3882 Beverly Rd. $ Anytown, MI 48105 +homePhone: +1 313 555 4772 description: Outstanding title: Mad Cow Researcher, UM Alumni Association pager: +1 313 555 3923 mail: jaj@mail.alumni.example.com -facsimiletelephonenumber: +1 313 555 4332 -telephonenumber: +1 313 555 0895 +facsimileTelephoneNumber: +1 313 555 4332 +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: OpenLDAPperson +dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=example + ,dc=com +objectClass: OpenLDAPperson cn: James A Jones 2 cn: James Jones cn: Jim Jones sn: Doe 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 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 933 Brooks $ Anytown, MI 48104 +homePhone: +1 313 555 8838 title: Senior Manager, Information Technology Division description: Not around very much mail: jjones@mailgw.example.com -postaladdress: Info Tech Division $ 535 W William $ Ann Arbor, MI 48103 +postalAddress: Info Tech Division $ 535 W William $ Anytown, MI 48103 pager: +1 313 555 2833 -facsimiletelephonenumber: +1 313 555 8688 -telephonenumber: +1 313 555 7334 +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: OpenLDAPperson +dn: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 drink: diet coke description: Enthusiastic mail: jdoe@woof.net -homephone: +1 313 555 5445 +homePhone: +1 313 555 5445 pager: +1 313 555 1220 -facsimiletelephonenumber: +1 313 555 2311 -telephonenumber: +1 313 555 4774 +facsimileTelephoneNumber: +1 313 555 2311 +telephoneNumber: +1 313 555 4774 -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan - ,c=US -objectclass: OpenLDAPperson +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com +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 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Sam Adams -homepostaladdress: 1000 Maple #44 $ Ann Arbor, MI 48103 +homePostalAddress: 1000 Maple #44 $ Anytown, MI 48103 title: Telemarketer, UM Alumni Association mail: jen@mail.alumni.example.com -homephone: +1 313 555 2333 +homePhone: +1 313 555 2333 pager: +1 313 555 6442 -facsimiletelephonenumber: +1 313 555 2756 -telephonenumber: +1 313 555 8232 +facsimileTelephoneNumber: +1 313 555 2756 +telephoneNumber: +1 313 555 8232 -dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M - ichigan,c=US -objectclass: OpenLDAPperson +dn: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc=com +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 -homepostaladdress: 912 East Bllvd $ Ann Arbor, MI 48104 +postalAddress: ITD $ 535 W. William $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 912 East Bllvd $ Anytown, MI 48104 title: System Administrator, Information Technology Division description: overworked! mail: johnd@mailgw.example.com -homephone: +1 313 555 3774 +homePhone: +1 313 555 3774 pager: +1 313 555 6573 -facsimiletelephonenumber: +1 313 555 4544 -telephonenumber: +1 313 555 9394 +facsimileTelephoneNumber: +1 313 555 4544 +telephoneNumber: +1 313 555 9394 -dn: cn=Manager,o=University of Michigan,c=US -objectclass: person +dn: cn=Manager,dc=example,dc=com +objectClass: person cn: Manager cn: Directory Manager cn: Dir Man sn: Manager description: Manager of the directory -userpassword:: c2VjcmV0 +userPassword:: c2VjcmV0 -dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c= - US -objectclass: OpenLDAPperson +dn: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 199 Outer Drive $ Ypsilanti, MI 48198 -homephone: +1 313 555 0388 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 199 Outer Drive $ Ypsilanti, MI 48198 +homePhone: +1 313 555 0388 drink: Gasoline title: Director, UM Alumni Association mail: melliot@mail.alumni.example.com pager: +1 313 555 7671 -facsimiletelephonenumber: +1 313 555 7762 -telephonenumber: +1 313 555 4177 +facsimileTelephoneNumber: +1 313 555 7762 +telephoneNumber: +1 313 555 4177 -dn: ou=People,o=University of Michigan,c=US -objectclass: organizationalUnit -objectclass: extensibleObject +dn: ou=People,dc=example,dc=com +objectClass: organizationalUnit +objectClass: extensibleObject ou: People uidNumber: 0 gidNumber: 0 -dn: o=University of Michigan,c=US -objectclass: organization -objectclass: domainRelatedObject -l: Ann Arbor, Michigan -st: Michigan -o: University of Michigan -o: UMICH -o: UM -o: U-M -o: U of M -description: The University of Michigan at Ann Arbor -postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481 - 09 $ US -telephonenumber: +1 313 764-1817 -associateddomain: example.com - -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michiga - n,c=US -objectclass: OpenLDAPperson +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com +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 -homepostaladdress: 123 Anystreet $ Ann Arbor, MI 48104 +postalAddress: Alumni Association $ 111 Maple St $ Anytown, MI 48109 +seeAlso: cn=All Staff,ou=Groups,dc=example,dc=com +homePostalAddress: 123 Anystreet $ Anytown, MI 48104 mail: uham@mail.alumni.example.com -homephone: +1 313 555 8421 +homePhone: +1 313 555 8421 pager: +1 313 555 2844 -facsimiletelephonenumber: +1 313 555 9700 -telephonenumber: +1 313 555 5331 +facsimileTelephoneNumber: +1 313 555 9700 +telephoneNumber: +1 313 555 5331 diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index 959c6b0a2d..a2680852cc 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -127,13 +127,13 @@ LDIFUNIQUE=$DATADIR/test-unique.ldif LDIFLIMITS=$DATADIR/test-limits.ldif MONITOR="" REFDN="c=US" -BASEDN="o=University of Michigan,c=US" -MANAGERDN="cn=Manager,o=University of Michigan,c=US" -UPDATEDN="cn=Replica,o=University of Michigan,c=US" +BASEDN="dc=example,dc=com" +MANAGERDN="cn=Manager,dc=example,dc=com" +UPDATEDN="cn=Replica,dc=example,dc=com" PASSWD=secret -BABSDN="cn=Barbara Jensen,ou=Information Technology DivisioN,OU=People,o=University of Michigan,c=us" -BJORNSDN="cn=Bjorn Jensen,ou=Information Technology DivisioN,OU=People,o=University of Michigan,c=us" -JAJDN="cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michigan,c=US" +BABSDN="cn=Barbara Jensen,ou=Information Technology DivisioN,OU=People,dc=example,dc=com" +BJORNSDN="cn=Bjorn Jensen,ou=Information Technology DivisioN,OU=People,dc=example,dc=com" +JAJDN="cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com" REFINTDN="cn=Manager,o=refint" UNIQUEDN="cn=Manager,o=unique" diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search index 4adf693f0a..f75435e161 100755 --- a/tests/scripts/test003-search +++ b/tests/scripts/test003-search @@ -87,7 +87,7 @@ fi echo "Testing OR searching..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(|(givenname=Xx*yY*Z)(cn=)(undef=*)(objectclass=groupofnames)(sn~=jones)(member=cn=Manager,o=University of Michigan,c=US)(uniqueMember=cn=Manager,o=University of Michigan,c=US))' >> $SEARCHOUT 2>&1 + '(|(givenname=Xx*yY*Z)(cn=)(undef=*)(objectclass=groupofnames)(sn=jones)(member=cn=Manager,dc=example,dc=com)(uniqueMember=cn=Manager,dc=example,dc=com))' >> $SEARCHOUT 2>&1 RC=$? if test $RC != 0 ; then echo "ldapsearch failed ($RC)!" @@ -97,7 +97,7 @@ fi echo "Testing AND matching and ends-with searching..." $LDAPSEARCH -S "" -b "ou=groups,$BASEDN" -s one -h $LOCALHOST -p $PORT1 \ - '(&(objectclass=groupofnames)(cn=A*)(member=cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c=US))' >> $SEARCHOUT 2>&1 + '(&(objectclass=groupofnames)(cn=A*)(member=cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com))' >> $SEARCHOUT 2>&1 RC=$? if test $RC != 0 ; then echo "ldapsearch failed ($RC)!" @@ -117,7 +117,7 @@ fi echo "Testing objectClass/attributeType inheritance ..." $LDAPSEARCH -M -a never -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(&(objectClass~=inetorgperson)(userid=uham))' \ + '(&(objectClass=inetorgperson)(userid=uham))' \ "2.5.4.0" "userid" >> $SEARCHOUT 2>&1 RC=$? if test $RC != 0 ; then diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index 14d5dabdd7..2df1ee61a6 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -61,7 +61,7 @@ version: 1 # LEADING COMMENT AND WHITE SPACE -dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com # EMBEDDED COMMENT changetype: modify add: drink @@ -79,7 +79,7 @@ sn: Jones add: sn sn: Jones -dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US +dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com changetype: modify # EMBEDDED COMMENT CONTINUED @@ -90,51 +90,51 @@ replace: drink drink: Iced Tea drink: Mad Dog 20/20 -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com changetype: modify delete: uniquemember uniquemember: cn=James A Jones 2,ou=Information Technology Division, - ou=People,o=University of Michigan,c=US + ou=People,dc=example,dc=com uniquemember: cn=Bjorn Jensen,ou=Information Technology Division, - ou=People,o=University of Michigan,c=US + ou=People,dc=example,dc=com - add: uniquemember uniquemember: cn=Dorothy Stevens,ou=Alumni Association, - ou=People,o=University of Michigan,c=US + ou=People,dc=example,dc=com uniquemember: cn=James A Jones 1,ou=Alumni Association, - ou=People,o=University of Michigan,c=US + ou=People,dc=example,dc=com -dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=All Staff,ou=Groups,dc=example,dc=com changetype: modify delete: member - add: member -member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michigan,c=US +member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com - delete: description -dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US +dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com changetype: add 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 +postaladdress: ITD $ 535 W. William St $ Anytown, MI 48103 +seealso: cn=All Staff,ou=Groups,dc=example,dc=com drink: Coffee -homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 +homepostaladdress: 844 Brown St. Apt. 4 $ Anytown, MI 48104 description: Very odd facsimiletelephonenumber: +1 313 555 7557 telephonenumber: +1 313 555 8343 mail: gjensen@mailgw.example.com homephone: +1 313 555 8844 -dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=University of Michigan,c=US +dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=example,dc=com changetype: delete # TRAILING COMMENT AND WHITE SPACE -dn: ou=People,o=University of Michigan,c=US +dn: ou=People,dc=example,dc=com changetype: modify increment: uidNumber uidNumber: 1 diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn index 6d05ac1c0f..32bed80a17 100755 --- a/tests/scripts/test005-modrdn +++ b/tests/scripts/test005-modrdn @@ -60,7 +60,7 @@ fi echo "Testing modrdn(deleteoldrdn=0)..." $LDAPMODRDN -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ - $TESTOUT 2>&1 'cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones III' + $TESTOUT 2>&1 'cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com' 'cn=James A Jones III' RC=$? if test $RC != 0 ; then @@ -71,7 +71,7 @@ fi echo "Testing modrdn(deleteoldrdn=1)..." $LDAPMODRDN -D "$MANAGERDN" -r -h $LOCALHOST -p $PORT1 -w $PASSWD >> \ - $TESTOUT 2>&1 'cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US' 'cn=James A Jones II' + $TESTOUT 2>&1 'cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example, dc=com' 'cn=James A Jones II' RC=$? if test $RC != 0 ; then @@ -182,7 +182,7 @@ fi echo "Testing modrdn(deleteoldrdn=1), modrdn with new rdn already an att val..." $LDAPMODRDN -D "$MANAGERDN" -r -h $LOCALHOST -p $PORT1 -w $PASSWD > \ - /dev/null 2>&1 'cn=James A Jones III, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones 1' + /dev/null 2>&1 'cn=James A Jones III, ou=Alumni Association, ou=People, dc=example, dc=com' 'cn=James A Jones 1' RC=$? if test $RC != 0 ; then diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index eddad5c0a1..30c8491862 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -99,10 +99,10 @@ EOMODS6 $LDAPMODIFY -D "$JAJDN" -h $LOCALHOST -p $PORT1 -w jaj > \ $TESTOUT 2>&1 << EOMODS1 version: 1 -dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US +dn: cn=ITD Staff, ou=Groups, dc=example, dc=com changetype: modify add: uniquemember -uniquemember: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US +uniquemember: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com EOMODS1 @@ -110,10 +110,10 @@ $LDAPMODIFY -D "$JAJDN" -h $LOCALHOST -p $PORT1 -w jaj >> \ $TESTOUT 2>&1 << EOMODS2 version: 1 -dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US +dn: cn=ITD Staff, ou=Groups, dc=example, dc=com changetype: modify add: uniquemember -uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com EOMODS2 # @@ -124,7 +124,7 @@ EOMODS2 $LDAPMODIFY -D "$JAJDN" -h $LOCALHOST -p $PORT1 -w jaj >> \ $TESTOUT 2>&1 << EOMODS3 -dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US +dn: cn=ITD Staff, ou=Groups, dc=example, dc=com changetype: modify delete: description @@ -135,7 +135,7 @@ $LDAPMODIFY -D "$BJORNSDN" -h $LOCALHOST -p $PORT1 -w bjorn >> \ # COMMENT version: 1 # comment -dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US +dn: cn=ITD Staff, ou=Groups, dc=example, dc=com # comment changetype: modify # comment diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication index 6876bbf70b..d5b76d6872 100755 --- a/tests/scripts/test007-replication +++ b/tests/scripts/test007-replication @@ -108,7 +108,7 @@ echo "Using ldapmodify to modify master directory..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS -dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com changetype: modify add: drink drink: Orange Juice @@ -119,28 +119,28 @@ sn: Jones add: sn sn: Jones -dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example, dc=com changetype: modify replace: drink drink: Iced Tea drink: Mad Dog 20/20 -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example, dc=com changetype: modify delete: uniqueMember uniqueMember: cn=James A Jones 2, ou=Information Technology Division, - ou=People, o=University of Michigan, c=US -uniqueMember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US + ou=People, dc=example, dc=com +uniqueMember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example, dc=com - add: uniqueMember -uniqueMember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US -uniqueMember: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +uniqueMember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, dc=example, dc=com +uniqueMember: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com -dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=All Staff,ou=Groups,dc=example, dc=com changetype: modify delete: description -dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, dc=example, dc=com changetype: add objectclass: OpenLDAPperson cn: Gern Jensen @@ -148,7 +148,7 @@ 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, dc=example, dc=com drink: Coffee homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 description: Very odd @@ -157,25 +157,25 @@ telephonenumber: +1 313 555 8343 mail: gjensen@mailgw.example.com homephone: +1 313 555 8844 -dn: ou=Retired, ou=People, o=University of Michigan, c=US +dn: ou=Retired, ou=People, dc=example, dc=com changetype: add objectclass: organizationalUnit ou: Retired -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example, dc=com changetype: add objectclass: OpenLDAPperson cn: Rosco P. Coltrane sn: Coltrane uid: rosco -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example, dc=com changetype: modrdn newrdn: cn=Rosco P. Coltrane deleteoldrdn: 1 -newsuperior: ou=Retired, ou=People, o=University of Michigan, c=US +newsuperior: ou=Retired, ou=People, dc=example, dc=com -dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example, dc=com changetype: delete EOMODS diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch index cd66c47d2f..ec0f9c0a2b 100755 --- a/tests/scripts/test015-xsearch +++ b/tests/scripts/test015-xsearch @@ -125,10 +125,9 @@ if test $RC != 0 ; then test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - echo "Testing extended RFC2254 searching..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(:dn:caseExactMatch:=University of Michigan)' >> $SEARCHOUT 2>&1 + '(:dn:caseIgnoreIA5Match:=example)' >> $SEARCHOUT 2>&1 RC=$? if test $RC != 0 ; then @@ -139,8 +138,8 @@ fi echo "Testing values return filter searching..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - -E '!mv=(o=University of Michigan)' \ - '(o=University of Michigan)' >> $SEARCHOUT 2>&1 + -E '!mv=(o=Example, Inc.)' \ + '(o=Example, Inc.)' >> $SEARCHOUT 2>&1 RC=$? if test $RC != 0 ; then echo "ldapsearch failed ($RC)!" diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh index 416610cbb9..b9882425f8 100755 --- a/tests/scripts/test017-syncreplication-refresh +++ b/tests/scripts/test017-syncreplication-refresh @@ -119,7 +119,7 @@ echo "Using ldapmodify to modify master directory..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS -dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example,dc=com changetype: modify add: drink drink: Orange Juice @@ -130,27 +130,27 @@ sn: Jones add: sn sn: Jones -dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: modify replace: drink drink: Iced Tea drink: Mad Dog 20/20 -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com changetype: modify delete: uniquemember -uniquemember: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US -uniquemember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +uniquemember: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com +uniquemember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com - add: uniquemember -uniquemember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US -uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +uniquemember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, dc=example,dc=com +uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example,dc=com -dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=All Staff,ou=Groups,dc=example,dc=com changetype: modify delete: description -dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: add objectclass: OpenLDAPperson cn: Gern Jensen @@ -158,7 +158,7 @@ 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, dc=example,dc=com drink: Coffee homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 description: Very odd @@ -167,25 +167,25 @@ telephonenumber: +1 313 555 8343 mail: gjensen@mailgw.example.com homephone: +1 313 555 8844 -dn: ou=Retired, ou=People, o=University of Michigan, c=US +dn: ou=Retired, ou=People, dc=example,dc=com changetype: add objectclass: organizationalUnit ou: Retired -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: add objectclass: OpenLDAPperson cn: Rosco P. Coltrane sn: Coltrane uid: rosco -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: modrdn newrdn: cn=Rosco P. Coltrane deleteoldrdn: 1 -newsuperior: ou=Retired, ou=People, o=University of Michigan, c=US +newsuperior: ou=Retired, ou=People, dc=example,dc=com -dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: delete EOMODS diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist index b960171afc..36996ffab4 100755 --- a/tests/scripts/test018-syncreplication-persist +++ b/tests/scripts/test018-syncreplication-persist @@ -119,7 +119,7 @@ echo "Using ldapmodify to modify master directory..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS -dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example,dc=com changetype: modify add: drink drink: Orange Juice @@ -130,27 +130,27 @@ sn: Jones add: sn sn: Jones -dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: modify replace: drink drink: Iced Tea drink: Mad Dog 20/20 -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com changetype: modify delete: uniquemember -uniquemember: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US -uniquemember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +uniquemember: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com +uniquemember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com - add: uniquemember -uniquemember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US -uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +uniquemember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, dc=example,dc=com +uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example,dc=com -dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=All Staff,ou=Groups,dc=example,dc=com changetype: modify delete: description -dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: add objectclass: OpenLDAPperson cn: Gern Jensen @@ -158,7 +158,7 @@ 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, dc=example,dc=com drink: Coffee homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 description: Very odd @@ -167,25 +167,25 @@ telephonenumber: +1 313 555 8343 mail: gjensen@mailgw.example.com homephone: +1 313 555 8844 -dn: ou=Retired, ou=People, o=University of Michigan, c=US +dn: ou=Retired, ou=People, dc=example,dc=com changetype: add objectclass: organizationalUnit ou: Retired -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: add objectclass: OpenLDAPperson cn: Rosco P. Coltrane sn: Coltrane uid: rosco -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: modrdn newrdn: cn=Rosco P. Coltrane deleteoldrdn: 1 -newsuperior: ou=Retired, ou=People, o=University of Michigan, c=US +newsuperior: ou=Retired, ou=People, dc=example,dc=com -dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: delete EOMODS diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade index ad259c16c6..2b26862b86 100755 --- a/tests/scripts/test019-syncreplication-cascade +++ b/tests/scripts/test019-syncreplication-cascade @@ -231,7 +231,7 @@ echo "Using ldapmodify to modify master directory..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS -dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example,dc=com changetype: modify add: drink drink: Orange Juice @@ -242,27 +242,27 @@ sn: Jones add: sn sn: Jones -dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: modify replace: drink drink: Iced Tea drink: Mad Dog 20/20 -dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=ITD Staff,ou=Groups,dc=example,dc=com changetype: modify delete: uniquemember -uniquemember: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US -uniquemember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +uniquemember: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com +uniquemember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com - add: uniquemember -uniquemember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US -uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +uniquemember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, dc=example,dc=com +uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example,dc=com -dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US +dn: cn=All Staff,ou=Groups,dc=example,dc=com changetype: modify delete: description -dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: add objectclass: OpenLDAPperson cn: Gern Jensen @@ -270,7 +270,7 @@ 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, dc=example,dc=com drink: Coffee homepostaladdress: 844 Brown St. Apt. 4 $ Ann Arbor, MI 48104 description: Very odd @@ -279,25 +279,25 @@ telephonenumber: +1 313 555 8343 mail: gjensen@mailgw.example.com homephone: +1 313 555 8844 -dn: ou=Retired, ou=People, o=University of Michigan, c=US +dn: ou=Retired, ou=People, dc=example,dc=com changetype: add objectclass: organizationalUnit ou: Retired -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: add objectclass: OpenLDAPperson cn: Rosco P. Coltrane sn: Coltrane uid: rosco -dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=Rosco P. Coltrane, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: modrdn newrdn: cn=Rosco P. Coltrane deleteoldrdn: 1 -newsuperior: ou=Retired, ou=People, o=University of Michigan, c=US +newsuperior: ou=Retired, ou=People, dc=example,dc=com -dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: delete EOMODS diff --git a/tests/scripts/test021-certificate b/tests/scripts/test021-certificate index 8cf191ad7e..bf3a4683f5 100755 --- a/tests/scripts/test021-certificate +++ b/tests/scripts/test021-certificate @@ -25,6 +25,7 @@ mkdir -p $TESTDIR $DBDIR1 echo "Running slapadd to build slapd database..." . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1 +echo $SLAPADD -f $CONF1 -l $LDIFORDERED $SLAPADD -f $CONF1 -l $LDIFORDERED RC=$? if test $RC != 0 ; then @@ -68,7 +69,7 @@ version: 1 # LEADING COMMENT AND WHITE SPACE # should use certificationAuthority instead of extensibleObject -dn: o=University of Michigan,c=US +dn: dc=example,dc=com changetype: modify add: objectClass objectClass: extensibleObject @@ -94,7 +95,7 @@ cAcertificate;binary:: 90ZZZh5Gbg5ZBxFRhDXN8K/fix3ewRSjASt40dGlEODkE+FsLMt04sYl6kX7RGKg 9a46DkeG+uzZnN/3252uCgh+rjNMFAglueUTERv3EtUB1iXEoU3GyA== -dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com changetype: modify add: objectClass objectClass: strongAuthenticationUser @@ -121,7 +122,7 @@ userCertificate;binary:: Px1Ijnsjh60qVRy9HOsHCungIKlGcnXLKHmKu0y//5jds/HnaJsGcHI5JRG7CBJb W+wrwge3trJ1xHJI8prN -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com changetype: modify add: objectClass objectClass: strongAuthenticationUser @@ -148,7 +149,7 @@ userCertificate;binary:: T8k50x4C7oE8HwZuEEB4FM7S1Zig3dfeJ8MJgdaLqt5/U9Ip/hZdzG2dsUsIceH/ 5MCKLu9bGJUjsKnGdm/KpaNwaNo= -dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com add: userCertificate;binary userCertificate;binary:: MIIDjDCCAvWgAwIBAgIBAzANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQGEwJVUzET diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits index 31853ae0cd..1f22388fab 100755 --- a/tests/scripts/test025-limits +++ b/tests/scripts/test025-limits @@ -71,7 +71,7 @@ echo "" echo "Testing no limits requested for unlimited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unlimited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unlimited User,ou=People,dc=example,dc=com' \ '(objectClass=*)' >$SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -89,7 +89,7 @@ esac SIZELIMIT=2 echo "Testing size limit request ($SIZELIMIT) for unlimited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Unlimited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unlimited User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -110,7 +110,7 @@ esac TIMELIMIT=10 echo "Testing time limit request ($TIMELIMIT s) for unlimited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -l $TIMELIMIT \ - -D 'cn=Unlimited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unlimited User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -130,7 +130,7 @@ esac echo "Testing no limits requested for soft limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Soft Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Soft Limited User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -151,7 +151,7 @@ esac SIZELIMIT=2 echo "Testing lower than soft limit request ($SIZELIMIT) for soft limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Soft Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Soft Limited User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -180,7 +180,7 @@ esac SIZELIMIT=100 echo "Testing higher than soft limit request ($SIZELIMIT) for soft limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Soft Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Soft Limited User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -209,7 +209,7 @@ esac SIZELIMIT=2 echo "Testing lower than hard limit request ($SIZELIMIT) for hard limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Hard Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Hard Limited User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -230,7 +230,7 @@ esac SIZELIMIT=100 echo "Testing higher than hard limit request ($SIZELIMIT) for hard limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Hard Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Hard Limited User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -253,7 +253,7 @@ esac echo "Testing lower than unchecked limit request for unchecked limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unchecked Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unchecked Limited User,ou=People,dc=example,dc=com' \ '(uid=uncheckedlimited)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -273,7 +273,7 @@ esac echo "Testing higher than unchecked limit requested for unchecked limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unchecked Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unchecked Limited User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -293,7 +293,7 @@ esac echo "Testing no limits requested for unchecked limited group..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unchecked Limited User 2,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unchecked Limited User 2,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -313,7 +313,7 @@ esac echo "Testing no limits requested for limited regex..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Foo User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Foo User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -341,7 +341,7 @@ esac echo "Testing no limits requested for limited onelevel..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Bar User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Bar User,ou=People,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -369,7 +369,7 @@ esac echo "Testing no limit requested for limited children..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unchecked Limited Users,ou=Groups,o=University of Michigan,c=US' \ + -D 'cn=Unchecked Limited Users,ou=Groups,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -397,7 +397,7 @@ esac echo "Testing no limit requested for limited subtree..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unchecked Limited User 3,ou=Admin,o=University of Michigan,c=US' \ + -D 'cn=Unchecked Limited User 3,ou=Admin,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -425,7 +425,7 @@ esac echo "Testing no limit requested for limited users..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Special User,o=University of Michigan,c=US' \ + -D 'cn=Special User,dc=example,dc=com' \ '(objectClass=*)' > $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -497,7 +497,7 @@ echo "" PAGESIZE=5 echo "Testing no limits requested for unlimited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unlimited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unlimited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -515,7 +515,7 @@ esac SIZELIMIT=2 echo "Testing size limit request ($SIZELIMIT) for unlimited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Unlimited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unlimited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -536,7 +536,7 @@ esac TIMELIMIT=10 echo "Testing time limit request ($TIMELIMIT s) for unlimited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -l $TIMELIMIT \ - -D 'cn=Unlimited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unlimited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -556,7 +556,7 @@ esac echo "Testing no limits requested for soft limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Soft Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Soft Limited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -577,7 +577,7 @@ esac SIZELIMIT=2 echo "Testing lower than soft limit request ($SIZELIMIT) for soft limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Soft Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Soft Limited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -606,7 +606,7 @@ esac SIZELIMIT=100 echo "Testing higher than soft limit request ($SIZELIMIT) for soft limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Soft Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Soft Limited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -635,7 +635,7 @@ esac SIZELIMIT=2 echo "Testing lower than hard limit request ($SIZELIMIT) for hard limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Hard Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Hard Limited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -656,7 +656,7 @@ esac SIZELIMIT=100 echo "Testing higher than hard limit request ($SIZELIMIT) for hard limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret -z $SIZELIMIT \ - -D 'cn=Hard Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Hard Limited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -679,7 +679,7 @@ esac echo "Testing lower than unchecked limit request for unchecked limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unchecked Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unchecked Limited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(uid=uncheckedlimited)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -699,7 +699,7 @@ esac echo "Testing higher than unchecked limit requested for unchecked limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unchecked Limited User,ou=People,o=University of Michigan,c=US' \ + -D 'cn=Unchecked Limited User,ou=People,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -723,7 +723,7 @@ echo "" echo "Testing no limit requested for unlimited page size ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Unlimited User,ou=Paged Results Users,o=University of Michigan,c=US' \ + -D 'cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -743,7 +743,7 @@ esac echo "Testing no limit requested for limited page size ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Page Size Limited User,ou=Paged Results Users,o=University of Michigan,c=US' \ + -D 'cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -766,7 +766,7 @@ esac echo "Testing no limit requested for pagedResults disabled ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Paged Results Disabled User,ou=Paged Results Users,o=University of Michigan,c=US' \ + -D 'cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -789,7 +789,7 @@ esac echo "Testing no limit requested for pagedResults total count limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Paged Results Limited User,ou=Paged Results Users,o=University of Michigan,c=US' \ + -D 'cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com' \ -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -813,7 +813,7 @@ esac SIZELIMIT=8 echo "Testing higher than hard but lower then total count limit requested for pagedResults total count limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Paged Results Limited User,ou=Paged Results Users,o=University of Michigan,c=US' \ + -D 'cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com' \ -z $SIZELIMIT -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT` @@ -845,7 +845,7 @@ esac SIZELIMIT=15 echo "Testing higher than total count limit requested for pagedResults total count limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ - -D 'cn=Paged Results Limited User,ou=Paged Results Users,o=University of Michigan,c=US' \ + -D 'cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com' \ -z $SIZELIMIT -E '!pr='$PAGESIZE '(objectClass=*)' $SEARCHOUT 2>&1 RC=$? COUNT=`awk '/^# numEntries:/ {print $3}' $SEARCHOUT`