Commit 3d0c1226 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story 1869. Fixed updatePassword to work with null old password when we want to reset the password.

parent dde2b1a0

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

+7 −7
Original line number Diff line number Diff line
@@ -933,17 +933,17 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 


            LDAPConnection conn = this.getReadWriteConnection();

            PasswordModifyExtendedRequest passwordModifyRequest;

            if (StringUtil.hasText(oldPassword))

            if (oldPassword == null)

            {

                passwordModifyRequest =

                    new PasswordModifyExtendedRequest(

                        userDN.toNormalizedString(), new String(oldPassword), new String(newPassword));

                        new PasswordModifyExtendedRequest(userDN.toNormalizedString(), 

                                null, new String(newPassword));              

            }

            else

            {

                passwordModifyRequest =

                    new PasswordModifyExtendedRequest(

                        userDN.toNormalizedString(), new String(newPassword));

                        new PasswordModifyExtendedRequest(userDN.toNormalizedString(), 

                                new String(oldPassword), new String(newPassword));                

            }



            PasswordModifyExtendedResult passwordModifyResult = (PasswordModifyExtendedResult)
@@ -986,7 +986,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
    public void resetPassword(HttpPrincipal userID, String newPassword)

        throws UserNotFoundException, TransientException, AccessControlException

    {

        updatePassword(userID, "", newPassword);

        updatePassword(userID, null, newPassword);

    }



    /**