From fd9af897161ab486cfede3b93b50415f99440dc1 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Thu, 29 Mar 2007 13:03:03 +0000
Subject: [PATCH] Fix regression caused by issue #1433 fix. Issue #1463.
---
opends/src/server/org/opends/server/core/ModifyOperation.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/ModifyOperation.java b/opends/src/server/org/opends/server/core/ModifyOperation.java
index b21d328..c665ac6 100644
--- a/opends/src/server/org/opends/server/core/ModifyOperation.java
+++ b/opends/src/server/org/opends/server/core/ModifyOperation.java
@@ -2361,8 +2361,13 @@
{
pwPolicyState.setRequiredChangeTime();
}
-
- modifications.addAll(pwPolicyState.getModifications());
+ //Apply pwd Policy modifications to modified entry.
+ try {
+ modifiedEntry.applyModifications(pwPolicyState.getModifications());
+ } catch (DirectoryException e) {
+ //Should not happen.
+ throw new RuntimeException(e);
+ }
}
else if(pwPolicyState.mustChangePassword())
{
--
Gitblit v1.10.0