Testcase tweaks to cope with differences between different openldap

server versions. Tested with 1.2.11 2.0.27 and 2.1.19

data/50-cmp.ldif

@@ -30,7 +30,7 @@ objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US
+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=Un
  iversity of Michigan, c=US
@@ -57,7 +57,7 @@ cn: All Staff
 description: Everyone in the sample data
 objectclass: groupofnames
 
-dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=Alumni Assoc Staff, ou=Groups, o=University of Michigan, c=US
 member: cn=Manager, o=University of Michigan, c=US
 member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of 
  Michigan, c=US
@@ -76,7 +76,7 @@ description: All Alumni Assoc Staff
 cn: Alumni Assoc Staff
 objectclass: groupofnames
 
-dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US
 owner: cn=Manager, o=University of Michigan, c=US
 description: All ITD Staff
 cn: ITD Staff

data/51b-cmp.ldif

@@ -1,4 +1,4 @@
-dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US
+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=Un
  iversity of Michigan, c=US
@@ -25,7 +25,7 @@ cn: All Staff
 description: Everyone in the sample data
 objectclass: groupofnames
 
-dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=Alumni Assoc Staff, ou=Groups, o=University of Michigan, c=US
 member: cn=Manager, o=University of Michigan, c=US
 member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of 
  Michigan, c=US
@@ -44,7 +44,7 @@ description: All Alumni Assoc Staff
 cn: Alumni Assoc Staff
 objectclass: groupofnames
 
-dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US
 owner: cn=Manager, o=University of Michigan, c=US
 description: All ITD Staff
 cn: ITD Staff

data/51c-cmp.ldif

@@ -1,4 +1,4 @@
-dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US
+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=Un
  iversity of Michigan, c=US
@@ -25,7 +25,7 @@ cn: All Staff
 description: Everyone in the sample data
 objectclass: groupofnames
 
-dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=Alumni Assoc Staff, ou=Groups, o=University of Michigan, c=US
 member: cn=Manager, o=University of Michigan, c=US
 member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of 
  Michigan, c=US

data/51d-cmp.ldif

@@ -20,7 +20,7 @@ objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US
+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=Un
  iversity of Michigan, c=US
@@ -47,7 +47,7 @@ cn: All Staff
 description: Everyone in the sample data
 objectclass: groupofnames
 
-dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=Alumni Assoc Staff, ou=Groups, o=University of Michigan, c=US
 member: cn=Manager, o=University of Michigan, c=US
 member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of 
  Michigan, c=US
@@ -66,7 +66,7 @@ description: All Alumni Assoc Staff
 cn: Alumni Assoc Staff
 objectclass: groupofnames
 
-dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US
 owner: cn=Manager, o=University of Michigan, c=US
 description: All ITD Staff
 cn: ITD Staff

data/52-cmp.ldif

@@ -30,13 +30,13 @@ objectclass: top
 objectclass: organizationalUnit
 ou: Groups
 
-dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=All Staff, ou=Groups, o=University of Michigan, c=US
 owner: cn=Manager, o=University of Michigan, c=US
 cn: All Staff
 description: Everyone in the sample data
 objectclass: groupofnames
 
-dn: cn=Alumni Assoc Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=Alumni Assoc Staff, ou=Groups, o=University of Michigan, c=US
 member: cn=Manager, o=University of Michigan, c=US
 member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of 
  Michigan, c=US
@@ -55,7 +55,7 @@ description: All Alumni Assoc Staff
 cn: Alumni Assoc Staff
 objectclass: groupofnames
 
-dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US
+dn: cn=ITD Staff, ou=Groups, o=University of Michigan, c=US
 owner: cn=Manager, o=University of Michigan, c=US
 description: All ITD Staff
 cn: ITD Staff

t/common.pl

@@ -52,6 +52,7 @@ BEGIN
 
 use Net::LDAP;
 use Net::LDAP::LDIF;
+use Net::LDAP::Util qw(canonical_dn);
 use File::Path qw(rmtree);
 use File::Basename qw(basename);
 
@@ -143,7 +144,7 @@ sub client {
     }
   }
   else {
-    until($ldap = Net::LDAP->new($HOST, port => $PORT)) {
+    until($ldap = Net::LDAP->new($HOST, port => $PORT, version => $LDAP_VERSION)) {
       die "ldap://$HOST:$PORT/ $@" if ++$count > 10;
       sleep 1;
     }
@@ -165,9 +166,14 @@ sub compare_ldif {
     return;
   }
 
+  my @canon_opt = (casefold => 'lower', separator => ', ');
   foreach $entry (@_) {
+    $entry->dn(canonical_dn($entry->dn, @canon_opt));
     foreach $attr ($entry->attributes) {
       $entry->delete($attr) if $attr =~ /^(modifiersname|modifytimestamp|creatorsname|createtimestamp)$/i;
+      if ($attr =~ /^(seealso|member|owner)$/i) {
+	$entry->replace($attr => [ map { canonical_dn($_, @canon_opt) } $entry->get_value($attr) ]);
+      }
     }
     $ldif->write($entry);
   }