From 3883d2297c3422d8aec2b40530c2d2b0a00ee57d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 25 Aug 2011 16:27:28 +0000
Subject: [PATCH] Final refactoring work for OPENDJ-262: Implement pass through authentication (PTA)
---
opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
index 612a6b6..52f3a4a 100644
--- a/opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
+++ b/opends/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
@@ -34,12 +34,11 @@
import org.opends.messages.Message;
import org.opends.server.admin.std.server.
PasswordPolicySubentryVirtualAttributeCfg;
+import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.config.ConfigException;
-import org.opends.server.core.PasswordPolicy;
-import org.opends.server.core.PasswordPolicyState;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
@@ -111,12 +110,11 @@
if (!entry.isSubentry() && !entry.isLDAPSubentry())
{
- PasswordPolicy policy = null;
+ AuthenticationPolicy policy = null;
try
{
- policy = PasswordPolicyState.getPasswordPolicy(
- entry, false);
+ policy = AuthenticationPolicy.forUser(entry, false);
}
catch (DirectoryException de)
{
@@ -133,7 +131,7 @@
}
}
- if (policy != null)
+ if (policy != null && policy.isPasswordPolicy())
{
AttributeType dnAttrType = DirectoryServer.getAttributeType(
"1.3.6.1.4.1.42.2.27.8.1.23");
--
Gitblit v1.10.0