Stripped whitespace between entry DN components.

diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master
index 260bd863daa9a6cdcc1361de8a69450ef359a905..d216f15000ab64e0584dae303a86e78f4a2f2617 100644 (file)
--- a/tests/data/acl.out.master
+++ b/tests/data/acl.out.master
@@ -1,5 +1,5 @@
-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 Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -65,13 +65,13 @@ 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,o=University of Michigan,c=US
 objectclass: top
 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,o=Universit
+ y of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -92,8 +92,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -113,13 +113,12 @@ pager: +1 313 555 4474
 facsimiletelephonenumber: +1 313 555 2177
 telephonenumber: +1 313 555 0355
 
-dn: ou=Groups, o=University of Michigan, c=US
+dn: ou=Groups,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-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: top
 objectclass: organizationalUnit
 ou: Information Technology Division
@@ -140,8 +139,8 @@ member: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of
  Michigan, c=US
 ou: Groups
 
-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=Universi
+ ty of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -161,8 +160,8 @@ 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 o
- f Michigan, c=US
+dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University of M
+ ichigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -181,7 +180,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,o=University of Michigan,c=US
 objectclass: top
 objectclass: person
 cn: Manager
@@ -190,12 +189,12 @@ cn: Dir Man
 sn: Manager
 description: Manager of the directory
 
-dn: ou=People, o=University of Michigan, c=US
+dn: ou=People,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: People
 
-dn: o=University of Michigan, c=US
+dn: o=University of Michigan,c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject

diff --git a/tests/data/do_add.1 b/tests/data/do_add.1
index 01196d8360cb52ebc2dc300650b988b8d61c9e0e..c2ca9cd0e438be718d12840db396f1fa2a15af0e 100644 (file)
--- a/tests/data/do_add.1
+++ b/tests/data/do_add.1
@@ -1,4 +1,4 @@
-cn=James A Jones 2, ou=Alumni Association, ou=People, o=University of Michigan, c=US
+cn=James A Jones 2,ou=Alumni Association,ou=People,o=University of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson

diff --git a/tests/data/modify.out.master b/tests/data/modify.out.master
index 43730515077b1f9ac47db5997e87601e979f2b59..ec9f01c5a1b82e2c1b426edf6f0a91ff8c343de3 100644 (file)
--- a/tests/data/modify.out.master
+++ b/tests/data/modify.out.master
@@ -25,13 +25,13 @@ 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,o=University of Michigan,c=US
 objectclass: top
 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,o=Universit
+ y of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -53,8 +53,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -76,8 +76,8 @@ 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 Mich
- igan, c=US
+dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -96,8 +96,8 @@ telephonenumber: +1 313 555 3664
 mail: dots@mail.alumni.umich.edu
 homephone: +1 313 555 0454
 
-dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=Universit
- y of Michigan, c=US
+dn: cn=Gern Jensen,ou=Information Technology Division,ou=People,o=University o
+ f Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -115,13 +115,12 @@ telephonenumber: +1 313 555 8343
 mail: gjensen@mailgw.umich.edu
 homephone: +1 313 555 8844
 
-dn: ou=Groups, o=University of Michigan, c=US
+dn: ou=Groups,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-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: top
 objectclass: organizationalUnit
 ou: Information Technology Division
@@ -139,8 +138,8 @@ member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of
 member: 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, o=University of Mich
- igan, c=US
+dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -162,8 +161,7 @@ facsimiletelephonenumber: +1 313 555 4332
 telephonenumber: +1 313 555 0895
 drink: Orange Juice
 
-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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -183,8 +181,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -203,8 +201,8 @@ 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 M
+ ichigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -223,7 +221,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,o=University of Michigan,c=US
 objectclass: top
 objectclass: person
 cn: Manager
@@ -233,8 +231,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -253,12 +251,12 @@ 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,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: People
 
-dn: o=University of Michigan, c=US
+dn: o=University of Michigan,c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
@@ -275,8 +273,8 @@ postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481
 telephonenumber: +1 313 764-1817
 associateddomain: umich.edu
 
-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 Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson

diff --git a/tests/data/modrdn.out.master b/tests/data/modrdn.out.master
index df6d06bb6288a8e69ab3cb3aa6d91150da063567..e356746980ec1da7f7fa2d3c63078ef5ffadb64c 100644 (file)
--- a/tests/data/modrdn.out.master
+++ b/tests/data/modrdn.out.master
@@ -44,13 +44,13 @@ 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,o=University of Michigan,c=US
 objectclass: top
 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,o=Univer
+ sity of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -72,8 +72,8 @@ 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=Universi
+ ty of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -94,8 +94,8 @@ 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 Mich
+ igan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -114,12 +114,12 @@ telephonenumber: +1 313 555 3664
 mail: dots@mail.alumni.umich.edu
 homephone: +1 313 555 0454
 
-dn: ou=Groups, o=University of Michigan, c=US
+dn: ou=Groups,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-dn: ou=Information Technology Division, ou=People, o=University of Michigan, c
+dn: ou=Information Technology Division,ou=People,o=University of Michigan,c
  =US
 objectclass: top
 objectclass: organizationalUnit
@@ -138,7 +138,7 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U
 member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi
  ty of Michigan, c=US
 
-dn: cn=James A Jones II, ou=Information Technology Division, ou=People, o=Univ
+dn: cn=James A Jones II,ou=Information Technology Division,ou=People,o=Univ
  ersity of Michigan, c=US
 objectclass: top
 objectclass: person
@@ -159,7 +159,7 @@ 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
+dn: cn=James A Jones III,ou=Alumni Association,ou=People,o=University of Mi
  chigan, c=US
 objectclass: top
 objectclass: person
@@ -182,7 +182,7 @@ mail: jaj@mail.alumni.umich.edu
 facsimiletelephonenumber: +1 313 555 4332
 telephonenumber: +1 313 555 0895
 
-dn: cn=Jane Doe, ou=Alumni Association, ou=People, o=University of Michigan, c
+dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c
  =US
 objectclass: top
 objectclass: person
@@ -203,7 +203,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
+dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michi
  gan, c=US
 objectclass: top
 objectclass: person
@@ -223,7 +223,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
+dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University o
  f Michigan, c=US
 objectclass: top
 objectclass: person
@@ -243,7 +243,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,o=University of Michigan,c=US
 objectclass: top
 objectclass: person
 cn: Manager
@@ -253,7 +253,7 @@ sn: Manager
 description: Manager of the directory
 userpassword:: c2VjcmV0
 
-dn: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Michigan
+dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan
  , c=US
 objectclass: top
 objectclass: person
@@ -273,12 +273,12 @@ 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,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: People
 
-dn: o=University of Michigan, c=US
+dn: o=University of Michigan,c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
@@ -295,7 +295,7 @@ postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481
 telephonenumber: +1 313 764-1817
 associateddomain: umich.edu
 
-dn: cn=Ursula Hampster, ou=Alumni Association, ou=People, o=University of Mich
+dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich
  igan, c=US
 objectclass: top
 objectclass: person

diff --git a/tests/data/modrdn.out.master.0 b/tests/data/modrdn.out.master.0
index df6d06bb6288a8e69ab3cb3aa6d91150da063567..5294d906ec6974298d1a537566ee2129c96f8ce3 100644 (file)
--- a/tests/data/modrdn.out.master.0
+++ b/tests/data/modrdn.out.master.0
@@ -44,13 +44,13 @@ 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,o=University of Michigan,c=US
 objectclass: top
 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,o=Universit
+ y of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -72,8 +72,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -94,8 +94,8 @@ 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 Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -114,13 +114,12 @@ telephonenumber: +1 313 555 3664
 mail: dots@mail.alumni.umich.edu
 homephone: +1 313 555 0454
 
-dn: ou=Groups, o=University of Michigan, c=US
+dn: ou=Groups,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-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: top
 objectclass: organizationalUnit
 ou: Information Technology Division
@@ -138,8 +137,8 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U
 member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi
  ty of Michigan, c=US
 
-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,o=Univers
+ ity of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -159,8 +158,8 @@ 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,o=University of Michi
+ gan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -182,8 +181,7 @@ mail: jaj@mail.alumni.umich.edu
 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,o=University of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -203,8 +201,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -223,8 +221,8 @@ 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 M
+ ichigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -243,7 +241,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,o=University of Michigan,c=US
 objectclass: top
 objectclass: person
 cn: Manager
@@ -253,8 +251,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -273,12 +271,12 @@ 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,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: People
 
-dn: o=University of Michigan, c=US
+dn: o=University of Michigan,c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
@@ -295,8 +293,8 @@ postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481
 telephonenumber: +1 313 764-1817
 associateddomain: umich.edu
 
-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 Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson

diff --git a/tests/data/modrdn.out.master.1 b/tests/data/modrdn.out.master.1
index 0483a50cc47cbb0e6c62f18251650a6382e0bc55..0363cd385a7ecce6c2f13ca8773cb5011eceb13d 100644 (file)
--- a/tests/data/modrdn.out.master.1
+++ b/tests/data/modrdn.out.master.1
@@ -1,5 +1,5 @@
-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,o=University of Michi
+ gan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson

diff --git a/tests/data/modrdn.out.master.2 b/tests/data/modrdn.out.master.2
index b83d0fc0f11592402c499f0c5e243853d3462e95..5e9f3aae4c6c53dcfd633a4ab62ab96c8f689bd5 100644 (file)
--- a/tests/data/modrdn.out.master.2
+++ b/tests/data/modrdn.out.master.2
@@ -1,5 +1,5 @@
-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,o=Univers
+ ity of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson

diff --git a/tests/data/modrdn.out.master.3 b/tests/data/modrdn.out.master.3
index ebe0fba843ca41b4cc795e007b8d1e6f38cb46fa..7473b767a212750bd8b3c4497d865b0b7d39f680 100644 (file)
--- a/tests/data/modrdn.out.master.3
+++ b/tests/data/modrdn.out.master.3
@@ -1,5 +1,5 @@
-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 Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson

diff --git a/tests/data/search.out.master b/tests/data/search.out.master
index d66b5e79ad26554b3e2145f5cee9f6dfb3607e35..236fd4750ddbacedf2caa95c0e7f24a82579d89f 100644 (file)
--- a/tests/data/search.out.master
+++ b/tests/data/search.out.master
@@ -1,5 +1,5 @@
-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=Universit
+ y of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -21,8 +21,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -102,8 +102,8 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U
 member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi
  ty 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 Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -216,18 +216,17 @@ 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,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: Alumni Association
 
-dn: ou=Groups, o=University of Michigan, c=US
+dn: ou=Groups,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-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: top
 objectclass: organizationalUnit
 ou: Information Technology Division
@@ -245,12 +244,12 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U
 member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi
  ty of Michigan, c=US
 
-dn: ou=People, o=University of Michigan, c=US
+dn: ou=People,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: People
 
-dn: o=University of Michigan, c=US
+dn: o=University of Michigan,c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject

diff --git a/tests/data/test-ordered.ldif b/tests/data/test-ordered.ldif
index 59690d7af365d30433be96a0c78d599898cee3fe..93a8bf4b87aaa99af759c33db0db2daba73f7653 100644 (file)
--- a/tests/data/test-ordered.ldif
+++ b/tests/data/test-ordered.ldif
@@ -1,4 +1,4 @@
-dn: o=University of Michigan, c=US
+dn: o=University of Michigan,c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
@@ -15,22 +15,22 @@ postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481
 telephonenumber: +1 313 764-1817
 associateddomain: umich.edu
 
-dn: ou=People, o=University of Michigan, c=US
+dn: ou=People,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: People
 
-dn: ou=Groups, o=University of Michigan, c=US
+dn: ou=Groups,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-dn: ou=Alumni Association, ou=People, o=University of Michigan, c=US
+dn: ou=Alumni Association,ou=People,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: Alumni Association
 
-dn: ou=Information Technology Division, ou=People, o=University of Michigan, c
+dn: ou=Information Technology Division,ou=People,o=University of Michigan,c
  =US
 objectclass: top
 objectclass: organizationalUnit
@@ -82,7 +82,7 @@ description: All Alumni Assoc Staff
 cn: Alumni Assoc Staff
 objectclass: groupofnames
 
-dn: cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=Univer
+dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=Univer
  sity of Michigan, c=US
 objectclass: top
 objectclass: person
@@ -105,7 +105,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
+dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=Universi
  ty of Michigan, c=US
 objectclass: top
 objectclass: person
@@ -127,7 +127,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
+dn: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Mich
  igan, c=US
 objectclass: top
 objectclass: person
@@ -160,7 +160,7 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U
 member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi
  ty of Michigan, c=US
 
-dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Mich
+dn: cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Mich
  igan, c=US
 objectclass: top
 objectclass: person
@@ -182,7 +182,7 @@ mail: jaj@mail.alumni.umich.edu
 facsimiletelephonenumber: +1 313 555 4332
 telephonenumber: +1 313 555 0895
 
-dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=Unive
+dn: cn=James A Jones 2,ou=Information Technology Division,ou=People,o=Unive
  rsity of Michigan, c=US
 objectclass: top
 objectclass: person
@@ -203,7 +203,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
+dn: cn=Jane Doe,ou=Alumni Association,ou=People,o=University of Michigan,c
  =US
 objectclass: top
 objectclass: person
@@ -224,7 +224,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
+dn: cn=Jennifer Smith,ou=Alumni Association,ou=People,o=University of Michi
  gan, c=US
 objectclass: top
 objectclass: person
@@ -244,7 +244,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
+dn: cn=John Doe,ou=Information Technology Division,ou=People,o=University o
  f Michigan, c=US
 objectclass: top
 objectclass: person
@@ -264,7 +264,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,o=University of Michigan,c=US
 objectclass: top
 objectclass: person
 cn: Manager
@@ -274,7 +274,7 @@ sn: Manager
 description: Manager of the directory
 userpassword:: c2VjcmV0
 
-dn: cn=Mark Elliot, ou=Alumni Association, ou=People, o=University of Michigan
+dn: cn=Mark Elliot,ou=Alumni Association,ou=People,o=University of Michigan
  , c=US
 objectclass: top
 objectclass: person
@@ -294,7 +294,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
+dn: cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of Mich
  igan, c=US
 objectclass: top
 objectclass: person

diff --git a/tests/data/test.ldif b/tests/data/test.ldif
index fab7b1ad8bdb80174a22cab6377ea8fbcdaeba46..a2b9b2ba5e3372376241af3b441c7db4e62b7a58 100644 (file)
--- a/tests/data/test.ldif
+++ b/tests/data/test.ldif
@@ -44,13 +44,13 @@ 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,o=University of Michigan,c=US
 objectclass: top
 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,o=Universit
+ y of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -72,8 +72,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -94,8 +94,8 @@ 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 Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -114,13 +114,12 @@ telephonenumber: +1 313 555 3664
 mail: dots@mail.alumni.umich.edu
 homephone: +1 313 555 0454
 
-dn: ou=Groups, o=University of Michigan, c=US
+dn: ou=Groups,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-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: top
 objectclass: organizationalUnit
 ou: Information Technology Division
@@ -138,8 +137,8 @@ member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=U
 member: cn=John Doe, ou=Information Technology Division, ou=People, o=Universi
  ty 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 Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -160,8 +159,8 @@ mail: jaj@mail.alumni.umich.edu
 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=Universi
+ ty of Michigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -181,8 +180,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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -202,8 +200,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -222,8 +220,8 @@ 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 M
+ ichigan,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson
@@ -242,7 +240,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,o=University of Michigan,c=US
 objectclass: top
 objectclass: person
 cn: Manager
@@ -252,8 +250,8 @@ 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: top
 objectclass: person
 objectclass: organizationalPerson
@@ -272,12 +270,12 @@ 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,o=University of Michigan,c=US
 objectclass: top
 objectclass: organizationalUnit
 ou: People
 
-dn: o=University of Michigan, c=US
+dn: o=University of Michigan,c=US
 objectclass: top
 objectclass: organization
 objectclass: domainRelatedObject
@@ -294,8 +292,8 @@ postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481
 telephonenumber: +1 313 764-1817
 associateddomain: umich.edu
 
-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 Michiga
+ n,c=US
 objectclass: top
 objectclass: person
 objectclass: organizationalPerson

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 32427f08e8678199c17952f80a5f63937087dbdb..7afd65bd175e322e8f17400c4a0bd9a46aa4525d 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -65,13 +65,13 @@ 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,o=University of Michigan,c=US
 # EMBEDDED COMMENT
 changetype: modify
 add: drink
 drink: Orange Juice
 
-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
 changetype: modify
 # EMBEDDED COMMENT
  CONTINUED
@@ -98,7 +98,7 @@ delete: member
 add: member
 member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US
 
-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,o=University of Michigan,c=US
 changetype: add
 objectclass: top
 objectclass: person
@@ -117,7 +117,7 @@ telephonenumber: +1 313 555 8343
 mail: gjensen@mailgw.umich.edu
 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,o=University of Michigan,c=US
 changetype: delete
 # TRAILING COMMENT AND WHITE SPACE