mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Control cleanup

Browse Source
This commit is contained in:
Kurt Zeilenga 2005-05-13 02:34:16 +00:00
parent 55585110bf
commit cfb3f81582
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/backend.c
View File

@ -821,8 +821,7 @@ backend_check_controls(
break; break;
case LDAP_COMPARE_FALSE: case LDAP_COMPARE_FALSE:
if ( !op->o_bd->be_ctrls[ cid ] && (*ctrls)->ldctl_iscritical ) if ( !op->o_bd->be_ctrls[cid] && (*ctrls)->ldctl_iscritical ) {
{
/* 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 * is recognized and appropriate for the operation (which
* we've already verified), then the server should make * we've already verified), then the server should make
@ -844,6 +843,11 @@ backend_check_controls(
default: default:
/* unreachable */ /* unreachable */
Debug( LDAP_DEBUG_ANY,
"backend_check_controls: unable to check control: %s\n",
(*ctrls)->ldctl_oid, 0, 0 );
assert( 0 );
rs->sr_text = "unable to check control"; rs->sr_text = "unable to check control";
rs->sr_err = LDAP_OTHER; rs->sr_err = LDAP_OTHER;
goto done; goto done;

2
servers/slapd/controls.c
View File

@ -1236,7 +1236,7 @@ static int parseSubentries (
? SLAP_CONTROL_CRITICAL ? SLAP_CONTROL_CRITICAL
: SLAP_CONTROL_NONCRITICAL; : SLAP_CONTROL_NONCRITICAL;
if ( (void *)(ctrl->ldctl_value.bv_val[2] != 0x00)) { if (ctrl->ldctl_value.bv_val[2]) {
set_subentries_visibility( op ); set_subentries_visibility( op );
} }