From ff6fa2b2dd7a6d4b405c0972041f16b889d527c3 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Sun, 18 May 2014 19:32:24 +0000
Subject: [PATCH] Port of fix to OPENDJ-1146, possible leak in ACI with subtree delete
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
index 4cafc04..c74cb18 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
@@ -362,11 +362,7 @@
{
return false;
}
- if (hasAci && aciList.remove(entryDN) == null)
- {
- return false;
- }
- if (!hasGlobalAci && !hasAci)
+ if (hasAci || !hasGlobalAci)
{
return aciList.removeSubtree(entryDN, null);
}
--
Gitblit v1.10.0