mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

neil_a_wilson
02.31.2006 e627deb0b7849bb8119b9566dd093b92ce9a2dbd
opends/src/server/org/opends/server/core/BindOperation.java
@@ -1165,6 +1165,15 @@
              setAuthFailureReason(msgID, message);
              break bindProcessing;
            }
            else if (pwPolicyState.isAccountExpired())
            {
              int    msgID   = MSGID_BIND_OPERATION_ACCOUNT_EXPIRED;
              String message = getMessage(msgID, String.valueOf(bindDN));
              setResultCode(ResultCode.INVALID_CREDENTIALS);
              setAuthFailureReason(msgID, message);
              break bindProcessing;
            }
            else if (pwPolicyState.lockedDueToFailures())
            {
              int    msgID   = MSGID_BIND_OPERATION_ACCOUNT_FAILURE_LOCKED;
@@ -1211,7 +1220,7 @@
            // Determine whether the password is expired, or whether the user
            // should be warned about an upcoming expiration.
            if (pwPolicyState.isExpired())
            if (pwPolicyState.isPasswordExpired())
            {
              if (pwPolicyErrorType == null)
              {
@@ -1547,6 +1556,14 @@
              appendErrorMessage(getMessage(msgID, userDNString));
              break bindProcessing;
            }
            else if (pwPolicyState.isAccountExpired())
            {
              setResultCode(ResultCode.INVALID_CREDENTIALS);
              int msgID = MSGID_BIND_OPERATION_ACCOUNT_EXPIRED;
              appendErrorMessage(getMessage(msgID, userDNString));
              break bindProcessing;
            }
            if (pwPolicyState.requireSecureAuthentication() &&
                (! clientConnection.isSecure()) &&
@@ -1605,7 +1622,7 @@
                break bindProcessing;
              }
              if (pwPolicyState.isExpired())
              if (pwPolicyState.isPasswordExpired())
              {
                if (pwPolicyErrorType == null)
                {