Commit 2765e19c authored by Brian Major's avatar Brian Major
Browse files

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

parents 48d6dd15 f8368ec8

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

+2 −3
Original line number Diff line number Diff line
@@ -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

0 → 100644
+7 −0
Original line number Diff line number Diff line 
# 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