fix broken test ldif files

diff --git a/tests/data/test-glued.ldif b/tests/data/test-glued.ldif
index 14b9d36ddb1ca05775cf87dedf7993da04059e9e..2297fcc36aacbaab0f9af7c762a00a57f987382d 100644 (file)
--- a/tests/data/test-glued.ldif
+++ b/tests/data/test-glued.ldif
@@ -9,8 +9,7 @@ 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
+postalAddress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 48109 $ US
 telephoneNumber: +1 313 764-1817
 associatedDomain: example.com
 
@@ -25,8 +24,7 @@ dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US
 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,o=University of Michigan,c=US
 objectClass: OpenLDAPperson
 cn: Dorothy Stevens
 cn: Dot Stevens
@@ -43,8 +41,7 @@ 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,o=University of Michigan,c=US
 objectClass: OpenLDAPperson
 cn: James A Jones 1
 cn: James Jones
@@ -81,8 +78,7 @@ 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,o=University of Michigan,c=US
 objectClass: OpenLDAPperson
 cn: Jennifer Smith
 cn: Jen Smith
@@ -108,8 +104,7 @@ 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,o=University of Michigan,c=US
 objectClass: OpenLDAPperson
 cn: Mark Elliot
 cn: Mark A Elliot
@@ -126,8 +121,7 @@ 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,o=University of Michigan,c=US
 objectClass: OpenLDAPperson
 cn: Ursula Hampster
 sn: Hampster
@@ -285,16 +279,14 @@ 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,o=University of Michigan,c=US
 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
+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==
 mail: bjensen@mailgw.example.com
@@ -306,8 +298,7 @@ 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,o=University of Michigan,c=US
 objectClass: OpenLDAPperson
 cn: Bjorn Jensen
 cn: Biiff Jensen
@@ -326,8 +317,7 @@ 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,o=University of Michigan,c=US
 objectClass: OpenLDAPperson
 cn: James A Jones 2
 cn: James Jones
@@ -345,8 +335,7 @@ 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,o=University of Michigan,c=US
 objectClass: OpenLDAPperson
 cn: John Doe
 cn: Jonathon Doe
@@ -369,26 +358,16 @@ 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
+member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=University 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 Michigan,c=US
+member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=University of Michigan,c=US
+member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US
 owner: cn=Manager,o=University of Michigan,c=US
 cn: All Staff
 description: Everyone in the sample data
@@ -396,18 +375,12 @@ 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
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=US
 owner: cn=Manager,o=University of Michigan,c=US
 description: All Alumni Assoc Staff
 cn: Alumni Assoc Staff
@@ -419,10 +392,7 @@ 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=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, o=University of Michigan,c=US
+uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=University of Michigan,c=US
 

diff --git a/tests/data/test-ordered-cp.ldif b/tests/data/test-ordered-cp.ldif
index 3cbe2ec327aeb9285a0e14fba8e00bbe9c5b3751..2e78090587b8ade6fdd83398dda0d3b913d32bf5 100644 (file)
--- a/tests/data/test-ordered-cp.ldif
+++ b/tests/data/test-ordered-cp.ldif
@@ -11,7 +11,6 @@ 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
+postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, 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 64171d1df264ee5ae5f48d1384ff8d35086fca6c..584fe8a08fc00bed9c419cb560d7d72c3b28df62 100644 (file)
--- a/tests/data/test-ordered-nocp.ldif
+++ b/tests/data/test-ordered-nocp.ldif
@@ -12,8 +12,7 @@ dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US
 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,o=University of Michigan,c=US
 objectclass: organizationalUnit
 ou: Information Technology Division
 description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD
@@ -158,26 +157,16 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC
 
 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
+member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=University 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 Michigan,c=US
+member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=University of Michigan,c=US
+member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US
 owner: cn=Manager,o=University of Michigan,c=US
 cn: All Staff
 description: Everyone in the sample data
@@ -185,33 +174,25 @@ 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
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=US
 owner: cn=Manager,o=University of Michigan,c=US
 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,o=University of Michigan,c=US
 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
+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==
 mail: bjensen@mailgw.example.com
@@ -223,8 +204,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Bjorn Jensen
 cn: Biiff Jensen
@@ -243,8 +223,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Dorothy Stevens
 cn: Dot Stevens
@@ -267,15 +246,11 @@ 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=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,o=University of Michigan,c=US 
+uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=University of Michigan,c=US
 
-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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: James A Jones 1
 cn: James Jones
@@ -294,8 +269,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: James A Jones 2
 cn: James Jones
@@ -313,8 +287,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Jane Doe
 cn: Jane Alverson
@@ -332,8 +305,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Jennifer Smith
 cn: Jen Smith
@@ -350,8 +322,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: John Doe
 cn: Jonathon Doe
@@ -377,8 +348,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Mark Elliot
 cn: Mark A Elliot
@@ -395,8 +365,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Ursula Hampster
 sn: Hampster

diff --git a/tests/data/test-ordered.ldif b/tests/data/test-ordered.ldif
index a852e442d05d49c901f9e0358870c0f5858709f3..e129343933486fcf628a89b5fc1f43f7217e87ed 100644 (file)
--- a/tests/data/test-ordered.ldif
+++ b/tests/data/test-ordered.ldif
@@ -11,8 +11,7 @@ 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
+postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 48109 $ US
 telephonenumber: +1 313 764-1817
 associateddomain: example.com
 
@@ -31,8 +30,7 @@ dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US
 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,o=University of Michigan,c=US
 objectclass: organizationalUnit
 ou: Information Technology Division
 description:: aMODwoPDgsKCw4PCgsOCwotFVlZQw4PCg8OCwoPDg8KCw4LCv0zDg8KDw4LCgsOD
@@ -177,26 +175,16 @@ description:: UF7Dg8KDw4LCg8ODwoLDgsKCw4PCg8OCwoPDg8KCw4LCjMODwoPDgsKDw4PCgsOC
 
 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
+member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=University 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 Michigan,c=US
+member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=University of Michigan,c=US
+member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US
 owner: cn=Manager,o=University of Michigan,c=US
 cn: All Staff
 description: Everyone in the sample data
@@ -204,33 +192,25 @@ 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
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan,c=US
+member: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Michigan,c=US
 owner: cn=Manager,o=University of Michigan,c=US
 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,o=University of Michigan,c=US
 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
+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==
 mail: bjensen@mailgw.example.com
@@ -242,8 +222,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Bjorn Jensen
 cn: Biiff Jensen
@@ -262,8 +241,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Dorothy Stevens
 cn: Dot Stevens
@@ -286,15 +264,11 @@ 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=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, o=University of Michigan,c=US
+uniquemember: cn=John Doe,ou=Information Technology Division,ou=People,o=University of Michigan,c=US
 
-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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: James A Jones 1
 cn: James Jones
@@ -313,8 +287,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: James A Jones 2
 cn: James Jones
@@ -332,8 +305,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Jane Doe
 cn: Jane Alverson
@@ -351,8 +323,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Jennifer Smith
 cn: Jen Smith
@@ -369,8 +340,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: John Doe
 cn: Jonathon Doe
@@ -396,8 +366,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Mark Elliot
 cn: Mark A Elliot
@@ -414,8 +383,7 @@ 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,o=University of Michigan,c=US
 objectclass: OpenLDAPperson
 cn: Ursula Hampster
 sn: Hampster