From fd650a8fd632005824a2e64d78549992ee9ffda0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Feb 2014 13:15:52 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
index f8be52e..0d970cc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
@@ -34,10 +34,10 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.types.DirectoryException;
import static org.opends.server.schema.SchemaConstants.*;
@@ -182,17 +182,9 @@
return ConditionResult.FALSE;
}
-
// We support the scheme, so make the determination.
- if (storageScheme.passwordMatches(assertionValue,
- ByteString.valueOf(userPWComponents[1])))
- {
- return ConditionResult.TRUE;
- }
- else
- {
- return ConditionResult.FALSE;
- }
+ return ConditionResult.valueOf(storageScheme.passwordMatches(
+ assertionValue, ByteString.valueOf(userPWComponents[1])));
}
--
Gitblit v1.10.0