Story 1736: Fix for tests and create/get groups.

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java

@@ -83,6 +83,7 @@ import org.apache.log4j.Logger;
 import ca.nrc.cadc.ac.PersonalDetails;
 import ca.nrc.cadc.ac.User;
 import ca.nrc.cadc.ac.UserNotFoundException;
+import ca.nrc.cadc.auth.AuthenticationUtil;
 import ca.nrc.cadc.auth.HttpPrincipal;
 import ca.nrc.cadc.net.TransientException;
 
@@ -407,7 +408,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
         }
 
         searchField = "(" + searchField + "=" +
-                      user.getUserID().getName() + ")";
+                      AuthenticationUtil.canonizeDistinguishedName(
+                              user.getUserID().getName()) + ")";
 
         SearchResultEntry searchResult = null;
         try

projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java

@@ -72,6 +72,9 @@ import java.security.Principal;
 import java.util.HashSet;
 import java.util.Set;
 
+import ca.nrc.cadc.auth.AuthenticationUtil;
+
+
 public class User<T extends Principal>
 {
     private T userID;
@@ -130,11 +133,7 @@ public class User<T extends Principal>
             return false;
         }
         User other = (User) obj;
-        if (!userID.equals(other.userID))
-        {
-            return false;
-        }
-        return true;
+        return AuthenticationUtil.equals(userID, other.userID);
     }
 
     @Override