Issue [1347] PwP: Administrative reset sets pwdReset:TRUE when ds-cfg-force...

david_page

03.42.2007 cd6c1abb69b1df38c70d132e67676eb8d34caa1d

Issue [1347] PwP: Administrative reset sets pwdReset:TRUE when ds-cfg-force-change-on-reset:FALSE if ds-cfg-force-change-on-add:TRUE

This change accommodates the case of:

configuration: ds-cfg-force-change-on-add:TRUE && ds-cfg-force-change-on-reset:FALSE

1. Add entry: set pwdReset:TRUE
2. Administrative reset: clear pwdReset

 opends/src/server/org/opends/server/core/ModifyOperation.java

@@ -2370,13 +2370,18 @@
          pwPolicyState.clearGraceLoginTimes();
          pwPolicyState.clearWarnedTime();

          if (selfChange && pwPolicyState.getPolicy().forceChangeOnAdd())
          if(pwPolicyState.getPolicy().forceChangeOnAdd()
             || pwPolicyState.getPolicy().forceChangeOnReset())
          {
            if (selfChange)
          {
            pwPolicyState.setMustChangePassword(false);
          }
          else if( pwPolicyState.getPolicy().forceChangeOnReset())
            else
          {
            pwPolicyState.setMustChangePassword(! selfChange);
              pwPolicyState.setMustChangePassword(
                   pwPolicyState.getPolicy().forceChangeOnReset());
            }
          }

          if (pwPolicyState.getPolicy().getRequireChangeByTime() > 0)