From 947dd2e4be789684b502df05e770afaade668d20 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Fri, 09 Mar 2007 00:04:17 +0000
Subject: [PATCH] Fix for one failing ACI unit test. The ACI syntax checks in the access control handler were doing some additional validation using the DN of the entry containing the ACI. These checks cannot be done by the ACI attribute syntax since it does not have the entry DN. Keep the ACI attribute syntax but put the syntax checks back into the ACI handler.
---
opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java
index 2015c1c..716fefb 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java
@@ -474,6 +474,24 @@
CATEGORY_MASK_ACCESS_CONTROL | 45;
/**
+ * The message ID for the ACI message that will be generated when a client
+ * attempts to add an entry with the "aci" attribute type
+ * and the ACI decode failed because of an syntax error. This takes one
+ * argument, which is the message string thrown by the AciException.
+ */
+ public static final int MSGID_ACI_ADD_FAILED_DECODE =
+ CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 46;
+
+ /**
+ * The message ID for the ACI message that will be generated when a client
+ * attempts to perform a modification on an "aci" attribute type
+ * and the ACI decode failed because of a syntax error. This takes one
+ * argument, which is the message string thrown by the AciException.
+ */
+ public static final int MSGID_ACI_MODIFY_FAILED_DECODE =
+ CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 47;
+
+ /**
* The message ID for the ACI message that will be generated when
* an ACI decode failed because of an syntax error. This message is usually
* generated by an invalid ACI that was added during import which
@@ -858,6 +876,16 @@
"attribute type in the entry \"%s\" failed, because the" +
"authorization DN \"%s\" lacked modify-acl privileges.");
+ registerMessage(MSGID_ACI_ADD_FAILED_DECODE,
+ "An attempt to add the entry \"%s\" containing" +
+ " an aci attribute type failed because of the following" +
+ " reason: %s");
+
+ registerMessage(MSGID_ACI_MODIFY_FAILED_DECODE,
+ "An attempt to modify an aci "+
+ "attribute type in the entry \"%s\" failed "+
+ "because of the following reason: %s");
+
registerMessage(MSGID_ACI_ADD_LIST_FAILED_DECODE,
"An attempt to decode an Access Control Instruction (ACI)" +
" failed because of the following reason: %s");
--
Gitblit v1.10.0