From 7c30dbb5403772b323df3ad907d9ed15d23b5aee Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 29 Apr 2010 20:35:40 +0000
Subject: [PATCH] Last batch of changes for this week. This adds support for the IETF based Password Policy for LDAP as SubEntry. Also resolves the following issues : - 4544 :  initializeBackend() should not set JE env config params directly. - 4478 : ECL in draft compat mode / search lastchangenumber can be very long - 4538 : Virtual attributes not retrieved when entry cache configured - 4547 : Search Filter Matching differ for cn=Directory Manager and plain user. - 4514 : Logs shows unexpected message with replication monitoring data missing (Partial fix) - 4534 : Replication using security does not work after server restart - 4516 : SEVERE_ERROR: servers (...) have the same ServerId In addition, they also improve reliability and performance in various areas including CollectiveAttributes, Virtual Attributes and Subentries management, Schema loading, Replication...

---
 opends/src/server/org/opends/server/tools/EncodePassword.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/EncodePassword.java b/opends/src/server/org/opends/server/tools/EncodePassword.java
index ff89902..f18b658 100644
--- a/opends/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opends/src/server/org/opends/server/tools/EncodePassword.java
@@ -535,7 +535,7 @@
           int size = storageSchemes.size();
 
           ArrayList<String> nameList = new ArrayList<String>(size);
-          for (PasswordStorageScheme<?> s : storageSchemes.values())
+          for (PasswordStorageScheme s : storageSchemes.values())
           {
             nameList.add(s.getAuthPasswordSchemeName());
           }
@@ -566,7 +566,7 @@
           int size = storageSchemes.size();
 
           ArrayList<String> nameList = new ArrayList<String>(size);
-          for (PasswordStorageScheme<?> s : storageSchemes.values())
+          for (PasswordStorageScheme s : storageSchemes.values())
           {
             nameList.add(s.getStorageSchemeName());
           }
@@ -622,7 +622,7 @@
           return 1;
         }
 
-        PasswordStorageScheme<?> storageScheme =
+        PasswordStorageScheme storageScheme =
              DirectoryServer.getAuthPasswordStorageScheme(scheme);
         if (storageScheme == null)
         {
@@ -672,7 +672,7 @@
       }
       else
       {
-        PasswordStorageScheme<?> storageScheme;
+        PasswordStorageScheme storageScheme;
         String                encodedPWString;
 
         if (UserPasswordSyntax.isEncoded(encodedPW))
@@ -772,7 +772,7 @@
     else
     {
       // Try to get a reference to the requested password storage scheme.
-      PasswordStorageScheme<?> storageScheme;
+      PasswordStorageScheme storageScheme;
       if (authPasswordSyntax.isPresent())
       {
         String scheme = schemeName.getValue();
@@ -909,10 +909,12 @@
           directoryServer.initializePlugins(pluginTypes);
           //Initialize Trust Backend.
           initializeServerBackends(directoryServer);
+          // Initialize the subentry manager.
+          directoryServer.initializeSubentryManager();
           //Initialize PWD policy components.
           directoryServer.initializePasswordPolicyComponents();
           //Load the crypto-manager key cache among other things.
-         new CryptoManagerSync(false);
+         new CryptoManagerSync();
     } catch (InitializationException ie) {
         Message message = ERR_ENCPW_CANNOT_INITIALIZE_SERVER_COMPONENTS.get(
                 getExceptionMessage(ie));
@@ -955,7 +957,7 @@
           backendCfg instanceof LDIFBackendCfg) {
         if(backendCfg.isEnabled()) {
           String className = backendCfg.getJavaClass();
-          Class<?> backendClass;
+          Class backendClass;
           Backend backend;
           try {
             backendClass = DirectoryServer.loadClass(className);
@@ -1181,7 +1183,7 @@
         try
         {
           // attempt masking at this rate
-          ErasingThread.sleep(1);
+          this.sleep(1);
         }
         catch (InterruptedException iex)
         {

--
Gitblit v1.10.0