From 8e509a01ff34b2a9e6b1abac54684ccbbdcae106 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Tue, 01 May 2007 16:41:59 +0000
Subject: [PATCH] Fix for issue #1562: Use of two ** notations results in bad ACI target application.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java | 14 +++++++++++++-
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternDN.java | 1 -
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
index 8d2475f..a1031e5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/PatternDN.java
@@ -657,7 +657,6 @@
// Initial piece.
subInitial = new PatternRDN[to];
subInitial = rdnComponents.subList(0, to).toArray(subInitial);
- i++;
}
int from;
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
index 0956fed..7e74943 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
@@ -86,7 +86,13 @@
{
"bjensen",
"uid=bjensen"
- }
+ },
+ {
+ "uid=dmiller, **, ou=branch level two, **, ou=aci branches, " +
+ "dc=example,dc=com",
+ "uid=dmiller, ou=branch level three, ou=branch level two, " +
+ "ou=branch level one, ou=aci branches, dc=example,dc=com"
+ },
};
}
@@ -119,6 +125,12 @@
"uid=bj*+cn=*,ou=people,dc=example,dc=com",
"sn=jensen+uid=bjensen,ou=people,dc=example,dc=com"
},
+ {
+ "uid=dmiller, **, ou=Bad branch level, **, ou=aci branches, " +
+ "dc=example,dc=com",
+ "uid=dmiller, ou=branch level three, ou=branch level two, " +
+ "ou=branch level one, ou=aci branches, dc=example,dc=com"
+ },
};
}
--
Gitblit v1.10.0