From a58e7b46dfb39b744ef3ea3970d55696ba68c646 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 27 Apr 2007 07:10:02 +0000
Subject: [PATCH] Fix for Issue #1485 (use new admin framework for password policy configuration)

---
 opends/src/server/org/opends/server/core/DirectoryServer.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index a44d5e7..2e4f507 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -4932,6 +4932,24 @@
   }
 
 
+  /**
+   * Retrieves the password policy registered for the provided configuration
+   * entry.
+   *
+   * @param  configEntryDN  The DN of the configuration entry for which to
+   *                        retrieve the associated password policy.
+   *
+   * @return  The password policy config registered for the provided
+   *          configuration entry, or <CODE>null</CODE> if there is
+   *          no such policy.
+   */
+  public static PasswordPolicyConfig getPasswordPolicyConfig(DN configEntryDN)
+  {
+    Validator.ensureNotNull(configEntryDN);
+
+    return directoryServer.passwordPolicies.get(configEntryDN);
+  }
+
 
   /**
    * Registers the provided password policy with the Directory Server.  If a
@@ -4940,14 +4958,13 @@
    *
    * @param  configEntryDN  The DN of the configuration entry that defines the
    *                        password policy.
-   * @param  policy         The password policy to register with the server.
+   * @param  config         The password policy config to register with the
+   *                        server.
    */
   public static void registerPasswordPolicy(DN configEntryDN,
-                                            PasswordPolicy policy)
+                                            PasswordPolicyConfig config)
   {
-    Validator.ensureNotNull(configEntryDN, policy);
-
-    PasswordPolicyConfig config = new PasswordPolicyConfig(policy);
+    Validator.ensureNotNull(configEntryDN, config);
 
     directoryServer.passwordPolicies.put(configEntryDN, config);
   }
@@ -4972,7 +4989,6 @@
 
     PasswordPolicyConfig config
             = directoryServer.passwordPolicies.remove(configEntryDN);
-    if (null != config) config.finalizePasswordPolicyConfig();
   }
 
 

--
Gitblit v1.10.0