From c70f83faf35bebaa246e24249a2c3b0ca7392745 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 12 Feb 2016 21:41:35 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for DNs: isDescendantOf() => isSubordinateOrEqualTo()
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
index 7b9d08a..0c05ec4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -621,14 +621,14 @@
}
break;
case WHOLE_SUBTREE:
- if(!entryDN.isDescendantOf(targetDN))
+ if(!entryDN.isSubordinateOrEqualTo(targetDN))
{
return false;
}
break;
case SUBORDINATES:
if (entryDN.size() <= targetDN.size() ||
- !entryDN.isDescendantOf(targetDN)) {
+ !entryDN.isSubordinateOrEqualTo(targetDN)) {
return false;
}
break;
@@ -645,7 +645,7 @@
EnumTargetOperator op=targets.getTarget().getOperator();
if(op == EnumTargetOperator.NOT_EQUALITY) {
DN tmpDN=targets.getTarget().getDN();
- if(entryDN.isDescendantOf(tmpDN))
+ if(entryDN.isSubordinateOrEqualTo(tmpDN))
{
return false;
}
--
Gitblit v1.10.0