The following update to core.PasswordPolicyState.java, along with some smal...

david_page

12.38.2007 2d838c933b9a3ce360855f11c14a5fb08712868d

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

@@ -1542,7 +1542,7 @@


              pwPolicyState.handleDeprecatedStorageSchemes(simplePassword);
              pwPolicyState.clearAuthFailureTimes();
              pwPolicyState.clearFailureLockout();

              if (isFirstWarning)
              {
@@ -1574,21 +1574,15 @@
              setResultCode(ResultCode.INVALID_CREDENTIALS);
              setAuthFailureReason(msgID, message);

              int maxAllowedFailures
                   = pwPolicyState.getPolicy().getLockoutFailureCount();
              if (maxAllowedFailures > 0)
              if (pwPolicyState.getPolicy().getLockoutFailureCount() > 0)
              {
                pwPolicyState.updateAuthFailureTimes();
                if (pwPolicyState.getAuthFailureTimes().size() >=
                    maxAllowedFailures)
                if (pwPolicyState.lockedDueToFailures())
                {
                  pwPolicyState.lockDueToFailures();

                  AccountStatusNotificationType notificationType;

                  int lockoutDuration
                       = pwPolicyState.getPolicy().getLockoutDuration();
                  if (lockoutDuration > 0)
                  int lockoutDuration = pwPolicyState.getSecondsUntilUnlock();
                  if (lockoutDuration > -1)
                  {
                    notificationType = AccountStatusNotificationType.
                                            ACCOUNT_TEMPORARILY_LOCKED;
@@ -2073,23 +2067,17 @@
              if (saslHandler.isPasswordBased(saslMechanism))
              {

                int maxAllowedFailures
                     = pwPolicyState.getPolicy().getLockoutFailureCount();
                if (maxAllowedFailures > 0)
                if (pwPolicyState.getPolicy().getLockoutFailureCount() > 0)
                {
                  pwPolicyState.updateAuthFailureTimes();
                  if (pwPolicyState.getAuthFailureTimes().size() >=
                      maxAllowedFailures)
                  if (pwPolicyState.lockedDueToFailures())
                  {
                    pwPolicyState.lockDueToFailures();

                    AccountStatusNotificationType notificationType;
                    int msgID;
                    String message;

                    int lockoutDuration
                         = pwPolicyState.getPolicy().getLockoutDuration();
                    if (lockoutDuration > 0)
                    int lockoutDuration = pwPolicyState.getSecondsUntilUnlock();
                    if (lockoutDuration > -1)
                    {
                      notificationType = AccountStatusNotificationType.
                                              ACCOUNT_TEMPORARILY_LOCKED;