Merge branch 's1736' of /srv/cadc/git/wopencadc into s1736

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

@@ -407,9 +407,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
                             .getClass());
         }
 
-        searchField = "(" + searchField + "=" +
-                      AuthenticationUtil.canonizeDistinguishedName(
-                              user.getUserID().getName()) + ")";
+        searchField = "(" + searchField + "=" + user.getUserID().getName()
+                      + ")";
 
         SearchResultEntry searchResult = null;
         try

projects/cadcAccessControl-Server/test/LdapConfig.test.properties

+# This are the configuration fields required by the Ldap ldap-dao unit tests
+server = proc5-03.cadc.dao.nrc.ca
+port = 636
+proxyUser = webproxy
+usersDn = ou=Users,ou=ds,dc=canfar,dc=net
+groupsDn = ou=Groups,ou=ds,dc=canfar,dc=net
+adminGroupsDn = ou=adminGroups,ou=ds,dc=canfar,dc=net
\ No newline at end of file