From 1596ccfcb23b1f5865560d9cb8e7ac79c3b30ddc Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] OPENDJ-2661 Fix checks for attribute types with passwords
---
opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index 0eae274..79b2f4f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -19,7 +19,6 @@
import static org.opends.messages.PluginMessages.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
-import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
import java.util.HashMap;
@@ -59,6 +58,8 @@
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.SubEntry;
+import org.opends.server.util.SchemaUtils;
+import org.opends.server.util.SchemaUtils.PasswordType;
/**
* This class implements a Directory Server plugin that performs various
@@ -229,11 +230,12 @@
HashSet<AttributeType> userPWTypes = new HashSet<>();
for (AttributeType t : DirectoryServer.getAttributeTypes())
{
- if (SYNTAX_AUTH_PASSWORD_OID.equals(t.getSyntax().getOID()))
+ final PasswordType passwordType = SchemaUtils.checkPasswordType(t);
+ if (passwordType.equals(PasswordType.AUTH_PASSWORD))
{
authPWTypes.add(t);
}
- else if (SYNTAX_USER_PASSWORD_OID.equals(t.getSyntax().getOID()))
+ else if (passwordType.equals(PasswordType.USER_PASSWORD))
{
userPWTypes.add(t);
}
--
Gitblit v1.10.0