From 67fd0c56c72c304e2a5c1ab87438edfafe23ca85 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 14 Jun 2007 03:10:29 +0000
Subject: [PATCH] Revert the changes committed in revision 2094 because they have broken the build due to a number of missing symbols.
---
opends/src/server/org/opends/server/messages/AciMessages.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/messages/AciMessages.java b/opends/src/server/org/opends/server/messages/AciMessages.java
index 811b377..722a2e0 100644
--- a/opends/src/server/org/opends/server/messages/AciMessages.java
+++ b/opends/src/server/org/opends/server/messages/AciMessages.java
@@ -740,15 +740,22 @@
public static final int MSGID_ACI_NOT_VALID_DN =
CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 73;
+ /**
+ * The message ID for the message that will be used if a targetattr
+ * keyword expression contains both operational and user attribute
+ * types. This takes one argument, which is the targetattr expression string.
+ */
+ public static final int MSGID_ACI_TARGETATTR_INVALID_OP_USER_ATTR =
+ CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 74;
+
/**
* The message ID for the message that will be used if a targetattr
- * keyword expression contains an error when a each token in an targetattr
- * expression was parsed. This takes one argument, which is the expression
- * string that caused the error.
+ * keyword expression performs both an inequality operation using
+ * operational attribute types. This takes one argument, which is the
+ * targetattr expression string.
*/
- public static final int MSGID_ACI_TARGETATTR_INVALID_ATTR_TOKEN =
- CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 74;
-
+ public static final int MSGID_ACI_TARGATTR_INVALID_OP_ATTR_INEQUALITY =
+ CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 75;
/**
* The message ID for the message that will be used if a roledn
@@ -756,7 +763,7 @@
* This takes one argument, which is the roledn expression string.
*/
public static final int MSGID_ACI_SYNTAX_ROLEDN_NOT_SUPPORTED =
- CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 75;
+ CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 76;
/**
* The message ID for the message that will be used if there are ACI decode
@@ -765,7 +772,7 @@
* exception.
*/
public static final int MSGID_ACI_SERVER_DECODE_FAILED =
- CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 76;
+ CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 77;
/**
@@ -774,7 +781,7 @@
* causing the server is being put in lockdown mode. The takes no arguments.
*/
public static final int MSGID_ACI_ENTER_LOCKDOWN_MODE =
- CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 77;
+ CATEGORY_MASK_ACCESS_CONTROL | SEVERITY_MASK_SEVERE_WARNING | 78;
/**
@@ -1199,11 +1206,17 @@
"Selfwrite check skipped because an attribute \"%s\" with a " +
"distinguished name syntax was not a valid DN");
- registerMessage(MSGID_ACI_TARGETATTR_INVALID_ATTR_TOKEN,
+ registerMessage(MSGID_ACI_TARGETATTR_INVALID_OP_USER_ATTR,
"The provided Access Control Instruction (ACI) " +
"targetattr expression value \"%s\" is invalid because" +
- " the expression contains invalid or duplicate tokens");
+ " the expression contains both operational attribute types" +
+ " and user attribute types");
+ registerMessage(MSGID_ACI_TARGATTR_INVALID_OP_ATTR_INEQUALITY,
+ "The provided Access Control Instruction (ACI) " +
+ "targetattr expression value \"%s\" is invalid because" +
+ " the expression performs an inequality operation using " +
+ "operational attribute types");
registerMessage(MSGID_ACI_SYNTAX_ROLEDN_NOT_SUPPORTED,
"The provided Access Control Instruction (ACI) expression " +
--
Gitblit v1.10.0