From 8aaa16f43f88550cbe7a8a2ddad12a917e845488 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 05 Jul 2007 05:56:48 +0000
Subject: [PATCH] Update the server processing for the LDAP no-op control so that it uses a nonzero result code. For now, we're using a result code of 16654 (0x410e, which is what OpenLDAP uses). If a new specification is released with an official OID and result code, then we'll use them.
---
opends/src/server/org/opends/server/messages/CoreMessages.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/opends/src/server/org/opends/server/messages/CoreMessages.java b/opends/src/server/org/opends/server/messages/CoreMessages.java
index b6e7111..48da4b4 100644
--- a/opends/src/server/org/opends/server/messages/CoreMessages.java
+++ b/opends/src/server/org/opends/server/messages/CoreMessages.java
@@ -6169,16 +6169,6 @@
CATEGORY_MASK_CORE | SEVERITY_MASK_NOTICE | 619;
- /**
- * The message ID for the message that will be used if a workflow is
- * configured with no root workflow element. No root workflow element
- * means no processing on the DIT attached to the workflow, which makes
- * no sense.
- */
- public static final int MSGID_WARNING_ROOT_WORKFLOW_ELEMENT_NOT_DEFINED =
- CATEGORY_MASK_CORE | SEVERITY_MASK_SEVERE_WARNING | 620;
-
-
/**
* The message ID for the message that will be used if an attribute used an
@@ -6222,6 +6212,16 @@
/**
+ * The message ID for the string representation of the result code that will
+ * be used to indicate no action was taken as a result of the LDAP no-op
+ * control. This does not take any arguments.
+ */
+ public static final int MSGID_RESULT_NO_OPERATION =
+ CATEGORY_MASK_CORE | SEVERITY_MASK_INFORMATIONAL | 624;
+
+
+
+ /**
* Associates a set of generic messages with the message IDs defined
* in this class.
*/
@@ -6390,6 +6390,7 @@
registerMessage(MSGID_RESULT_CANNOT_CANCEL, "Cannot Cancel");
registerMessage(MSGID_RESULT_ASSERTION_FAILED, "Assertion Failed");
registerMessage(MSGID_RESULT_AUTHORIZATION_DENIED, "Authorization Denied");
+ registerMessage(MSGID_RESULT_NO_OPERATION, "No Operation");
registerMessage(MSGID_UNKNOWN_ATTRIBUTE_USAGE,
@@ -8453,11 +8454,6 @@
"The Directory Server is leaving lockdown mode and will " +
"resume normal operation");
- registerMessage(MSGID_WARNING_ROOT_WORKFLOW_ELEMENT_NOT_DEFINED,
- "The workflow with base DN \"%s\" has no root workflow " +
- "element"
- );
-
registerMessage(MSGID_COMPRESSEDSCHEMA_UNRECOGNIZED_AD_TOKEN,
"Unable to decode the provided attribute because it " +
@@ -8473,10 +8469,6 @@
registerMessage(MSGID_ENTRYENCODECFG_INVALID_LENGTH,
"Unable to decode the provided entry encode " +
"configuration element because it has an invalid length");
-
- registerMessage(MSGID_WARNING_ROOT_WORKFLOW_ELEMENT_NOT_DEFINED,
- "The workflow with base DN \"%s\" has no root workflow " +
- "element");
}
}
--
Gitblit v1.10.0