From 7d8cef5c212813bf211a0c243bcfa7c45875152f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Aug 2015 08:56:25 +0000
Subject: [PATCH] Extracted method PasswordPolicyState.isLocked().

---
 opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
index f6c37ae..dcfb261 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -308,11 +308,7 @@
     if (state.isPasswordPolicy())
     {
       PasswordPolicyState pwpState = (PasswordPolicyState) state;
-      if (pwpState.isAccountExpired() ||
-          pwpState.lockedDueToFailures() ||
-          pwpState.lockedDueToIdleInterval() ||
-          pwpState.lockedDueToMaximumResetAge() ||
-          pwpState.isPasswordExpired())
+      if (pwpState.isAccountExpired() || pwpState.isLocked() || pwpState.isPasswordExpired())
       {
         LocalizableMessage message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(userEntry.getName());
         throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);

--
Gitblit v1.10.0