From 4db5f341ecb857dfa271518d12ef693e41cb4f98 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Wed, 31 Jul 2013 08:15:13 +0000
Subject: [PATCH] CR 2074 Fix OPENDJ-1097 Default access controls grant access to ds-sync-hist
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java | 4 ++--
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
index 04debcb..18a0b48 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2012 ForgeRock AS
+ * Portions Copyright 2012-2013 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -276,7 +276,6 @@
targetAttr.opAttributes.contains(a))
ret=true;
if(targetAttr.isAllOpAttributes() ||
- !targetAttr.attributes.isEmpty() ||
!targetAttr.opAttributes.isEmpty()) {
if(targetAttr.getOperator().
equals(EnumTargetOperator.NOT_EQUALITY))
@@ -287,7 +286,6 @@
targetAttr.attributes.contains(a))
ret=true;
if(targetAttr.isAllUserAttributes() ||
- !targetAttr.opAttributes.isEmpty() ||
!targetAttr.attributes.isEmpty()) {
if(targetAttr.getOperator().
equals(EnumTargetOperator.NOT_EQUALITY))
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
index c728f1e..794e600 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
@@ -400,8 +400,8 @@
{ "!=", "cn || sn", "sn", false },
{ "!=", "cn", "sn", true }, // Not eq user attr
{ "!=", "cn || sn", "description", true }, // Not eq user attr
- { "!=", "cn || sn", "modifytimestamp", true }, // Not eq op attr
- { "!=", "aci", "cn", true },
+ { "!=", "cn || sn", "modifytimestamp", false }, // Not eq op attr
+ { "!=", "aci", "cn", false },
{ "!=", "aci", "modifytimestamp", true },
};
}
--
Gitblit v1.10.0