Commit 336c9dfb authored by Brian Major's avatar Brian Major
Browse files

s1736 - Order DN in 'java' format on user search

parent 2765e19c

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

+15 −3
Original line number Diff line number Diff line
@@ -407,8 +407,20 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
                            .getClass());

        }

        

        // change the DN to be in the 'java' format

        if (user.getUserID() instanceof X500Principal)

        {

            X500Principal orderedPrincipal = AuthenticationUtil.getOrderedForm(

                (X500Principal) user.getUserID());

            searchField = "(" + searchField + "=" + orderedPrincipal.toString() + ")";

        }

        else

        {

            searchField = "(" + searchField + "=" + user.getUserID().getName()

                    + ")";

        }

        

        logger.debug("Search field is: " + searchField);



        SearchResultEntry searchResult = null;

        try