From c01c421b26e6409febd6af1db1c9db11b7b347a4 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 07 Jan 2014 15:06:31 +0000
Subject: [PATCH] Align server types API with SDK types API
---
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java
index 8d833d0..94e8e15 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/UserDN.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -230,7 +230,7 @@
}
case PARENT:
{
- DN parentDN = resDN.getParent();
+ DN parentDN = resDN.parent();
if ((parentDN != null) &&
(parentDN.equals(clientDN)))
matched = EnumEvalResult.TRUE;
@@ -319,12 +319,12 @@
if(!evalCtx.getClientDN().isDescendantOf(urlDN))
return EnumEvalResult.FALSE;
} else if(scope == SearchScope.SINGLE_LEVEL) {
- DN parent=evalCtx.getClientDN().getParent();
+ DN parent=evalCtx.getClientDN().parent();
if((parent != null) && !parent.equals(urlDN))
return EnumEvalResult.FALSE;
} else if(scope == SearchScope.SUBORDINATE_SUBTREE) {
DN userDN = evalCtx.getClientDN();
- if ((userDN.getNumComponents() <= urlDN.getNumComponents()) ||
+ if ((userDN.size() <= urlDN.size()) ||
!userDN.isDescendantOf(urlDN)) {
return EnumEvalResult.FALSE;
}
@@ -364,7 +364,7 @@
List<Attribute> attrs = e.getAttribute(attrType);
for(AttributeValue v : attrs.get(0)) {
try {
- DN dn=DN.decode(v.getValue().toString());
+ DN dn=DN.valueOf(v.getValue().toString());
if(dn.equals(clientDN)) {
matched=EnumEvalResult.TRUE;
break;
--
Gitblit v1.10.0