mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert part of last (two) commits. Need additional infrastructure first.

Browse Source
This commit is contained in:
Kurt Zeilenga 2005-01-25 18:09:59 +00:00
parent 82d5ca4d4e
commit d68041ce50
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servers/slapd/backend.c
View File

@ -803,18 +803,22 @@ backend_check_controls(
if( ctrls ) {
for( ; *ctrls != NULL ; ctrls++ ) {
if( !ldap_charray_inlist( op->o_bd->be_controls,
(*ctrls)->ldctl_oid ) )
if( (*ctrls)->ldctl_iscritical && !ldap_charray_inlist(
op->o_bd->be_controls, (*ctrls)->ldctl_oid ) )
{
/* 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).
* (regardless of the criticality of the control).
*
* Here we find that operation extended by the control
* is not unavailable in a particular context, hence the
* return of unwillingToPerform.
*
* FIXME: As noted above, this check should be done
* regardless of the criticality of the control. The
* frontend infrastructure doesn't (yet) support this.
*/
rs->sr_text = "control unavailable in context";
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;