From c9da9e4bd4a115a646dfb846972126ca8eef1158 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 18 Aug 2011 17:43:22 +0000
Subject: [PATCH] Initial checkpoint of work for OPENDJ-262: Implement pass through authentication (PTA)
---
opends/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java b/opends/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
index 62a7153..ff12942 100644
--- a/opends/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
+++ b/opends/src/server/org/opends/server/extensions/PasswordPolicyStateExtendedOperation.java
@@ -927,7 +927,7 @@
if (returnAll || returnTypes.contains(OP_GET_PASSWORD_POLICY_DN))
{
encode(writer, OP_GET_PASSWORD_POLICY_DN,
- policy.getConfigEntryDN().toString());
+ policy.getDN().toString());
}
if (returnAll || returnTypes.contains(OP_GET_ACCOUNT_DISABLED_STATE))
@@ -1025,14 +1025,15 @@
returnTypes.contains(OP_GET_SECONDS_UNTIL_PASSWORD_EXPIRATION_WARNING))
{
String secondsStr;
- int secondsUntilExp = pwpState.getSecondsUntilExpiration();
+ long secondsUntilExp = pwpState.getSecondsUntilExpiration();
if (secondsUntilExp < 0)
{
secondsStr = null;
}
else
{
- int secondsUntilWarning = secondsUntilExp - policy.getWarningInterval();
+ long secondsUntilWarning = secondsUntilExp
+ - policy.getPasswordExpirationWarningInterval();
if (secondsUntilWarning <= 0)
{
secondsStr = "0";
@@ -1124,7 +1125,7 @@
if (returnAll || returnTypes.contains(OP_GET_SECONDS_UNTIL_IDLE_LOCKOUT))
{
String secondsStr;
- int lockoutInterval = policy.getIdleLockoutInterval();
+ long lockoutInterval = policy.getIdleLockoutInterval();
if (lockoutInterval > 0)
{
long lastLoginTime = pwpState.getLastLoginTime();
@@ -1167,13 +1168,13 @@
String secondsStr;
if (pwpState.mustChangePassword())
{
- int maxAge = policy.getMaximumPasswordResetAge();
+ long maxAge = policy.getMaxPasswordResetAge();
if (maxAge > 0)
{
long currentTime = pwpState.getCurrentTime();
long changedTime = pwpState.getPasswordChangedTime();
int changeAge = (int) ((currentTime - changedTime) / 1000);
- int timeToLockout = maxAge - changeAge;
+ long timeToLockout = maxAge - changeAge;
if (timeToLockout <= 0)
{
secondsStr = "0";
--
Gitblit v1.10.0