From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 25 Jan 2005 16:52:16 +0000 (+0000)
Subject: Prelim unavailableCriticalExtension v. unwillingToPerform fix (ITS#3308)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~260
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dd75979100e5232699a58cd918acaa3a8b4dd4c4;p=openldap

Prelim unavailableCriticalExtension v. unwillingToPerform fix (ITS#3308)
---

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 105dffe4f9..942d10ebb2 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -803,25 +803,24 @@ backend_check_controls(
 
 	if( ctrls ) {
 		for( ; *ctrls != NULL ; ctrls++ ) {
-			if( (*ctrls)->ldctl_iscritical && !ldap_charray_inlist(
-				op->o_bd->be_controls, (*ctrls)->ldctl_oid ) )
+			if( !ldap_charray_inlist( op->o_bd->be_controls,
+				(*ctrls)->ldctl_oid ) )
 			{
-				/* FIXME: standards compliance issue
-				 *
-				 * Per RFC 2251 (and LDAPBIS discussions), if the control
+				/* Per RFC 2251 (and LDAPBIS discussions), if the control
 				 * is recognized and appropriate for the operation (which
 				 * we've already verified), then the server should make
 				 * use of the control when performing the operation
-				 * (without regard to criticality).  This code is incorrect
-				 * on two counts.
-				 * 1) a service error (e.g., unwillingToPerform) should be
-				 * returned where a particular backend cannot service the
-				 * operation,
-				 * 2) this error should be returned irregardless of the
-				 * criticality of the control.
+				 * (without regard to criticality).
+				 * 
+				 * Here we find that operation extended by the control
+				 * is not unavailable in a particular context, hence the
+				 * return of unwillingToPerform.
+				 *
+				 * Note that criticality of the control is irrelevant to
+				 * this condition.
 				 */
 				rs->sr_text = "control unavailable in context";
-				rs->sr_err = LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
+				rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
 				break;
 			}
 		}