From c0144353899d1191c10de1d50e60036e508d5189 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Tue, 10 Oct 2006 22:42:30 +0000
Subject: [PATCH] Fixes for the following issues, reviewed by neil_a_wilson. issue 776: Overflow of large values for time limit. issue 781: search result entries have their object class in the wrong field.
---
opends/src/server/org/opends/server/core/PasswordPolicyState.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PasswordPolicyState.java b/opends/src/server/org/opends/server/core/PasswordPolicyState.java
index c30c17f..43583d2 100644
--- a/opends/src/server/org/opends/server/core/PasswordPolicyState.java
+++ b/opends/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -1366,7 +1366,7 @@
LinkedHashSet<AttributeValue> values = null;
long expirationTime = currentTime -
- (passwordPolicy.getLockoutFailureExpirationInterval()*1000);
+ (passwordPolicy.getLockoutFailureExpirationInterval()*1000L);
Iterator<Long> iterator = authFailureTimes.iterator();
while (iterator.hasNext())
{
@@ -1715,7 +1715,7 @@
if (passwordPolicy.getLockoutDuration() > 0)
{
long unlockTime = failureLockedTime +
- (1000*passwordPolicy.getLockoutDuration());
+ (1000L*passwordPolicy.getLockoutDuration());
if (unlockTime > currentTime)
{
if (debug)
@@ -2141,7 +2141,7 @@
}
long lockTime = currentTime -
- (passwordPolicy.getIdleLockoutInterval()*1000);
+ (passwordPolicy.getIdleLockoutInterval()*1000L);
long lastLoginTime = getLastLoginTime();
if (lastLoginTime > 0)
{
@@ -2488,7 +2488,7 @@
}
long maxResetTime = passwordChangedTime +
- (1000 * passwordPolicy.getMaximumPasswordResetAge());
+ (1000L * passwordPolicy.getMaximumPasswordResetAge());
boolean locked = (maxResetTime < currentTime);
if (debug)
@@ -2529,7 +2529,7 @@
int maxAge = passwordPolicy.getMaximumPasswordAge();
if (maxAge > 0)
{
- long expTime = passwordChangedTime + (1000*maxAge);
+ long expTime = passwordChangedTime + (1000L*maxAge);
if (expTime < expirationTime)
{
expirationTime = expTime;
@@ -2540,7 +2540,7 @@
int maxResetAge = passwordPolicy.getMaximumPasswordResetAge();
if (mustChangePassword() && (maxResetAge > 0))
{
- long expTime = passwordChangedTime + (1000*maxResetAge);
+ long expTime = passwordChangedTime + (1000L*maxResetAge);
if (expTime < expirationTime)
{
expirationTime = expTime;
@@ -2575,7 +2575,7 @@
int warningInterval = passwordPolicy.getWarningInterval();
if (warningInterval > 0)
{
- long shouldWarnTime = expirationTime - (warningInterval*1000);
+ long shouldWarnTime = expirationTime - (warningInterval*1000L);
if (shouldWarnTime > currentTime)
{
// The warning time is in the future, so we know the password isn't
@@ -2603,7 +2603,7 @@
if (! passwordPolicy.expirePasswordsWithoutWarning())
{
- expirationTime = currentTime + (warningInterval*1000);
+ expirationTime = currentTime + (warningInterval*1000L);
}
}
else
@@ -2612,7 +2612,7 @@
if (! passwordPolicy.expirePasswordsWithoutWarning())
{
- expirationTime = warnedTime + (warningInterval*1000);
+ expirationTime = warnedTime + (warningInterval*1000L);
}
}
}
@@ -2628,7 +2628,7 @@
}
else if (warnedTime > 0)
{
- expirationTime = warnedTime + (warningInterval*1000);
+ expirationTime = warnedTime + (warningInterval*1000L);
if (expirationTime > currentTime)
{
shouldWarn = ConditionResult.TRUE;
@@ -2647,7 +2647,7 @@
shouldWarn = ConditionResult.TRUE;
isFirstWarning = ConditionResult.TRUE;
isPasswordExpired = ConditionResult.FALSE;
- expirationTime = currentTime + (warningInterval*1000);
+ expirationTime = currentTime + (warningInterval*1000L);
}
}
}
@@ -2770,7 +2770,7 @@
return false;
}
- else if ((passwordChangedTime + (minAge*1000)) < currentTime)
+ else if ((passwordChangedTime + (minAge*1000L)) < currentTime)
{
// It's been long enough since the user changed their password.
if (debug)
--
Gitblit v1.10.0