backout ITS#5758 commit

This commit is contained in:
Pierangelo Masarati 2008-10-20 23:19:07 +00:00
parent e233a8e9ee
commit c1119ec9b3

View File

@ -1038,26 +1038,6 @@ static int parseNoOp (
return LDAP_PROTOCOL_ERROR; return LDAP_PROTOCOL_ERROR;
} }
if ( !ctrl->ldctl_iscritical ) {
rs->sr_text = "noop control not critical";
return LDAP_PROTOCOL_ERROR;
}
switch ( op->o_tag ) {
case LDAP_REQ_ADD:
case LDAP_REQ_MODIFY:
case LDAP_REQ_RENAME:
case LDAP_REQ_DELETE:
/* NOTE: only selected extended operations should be eligible;
* checking is delegated to the appropriate handlers */
case LDAP_REQ_EXTENDED:
break;
default:
rs->sr_text = "noop control on non-allowed operation";
return LDAP_PROTOCOL_ERROR;
}
op->o_noop = ctrl->ldctl_iscritical op->o_noop = ctrl->ldctl_iscritical
? SLAP_CONTROL_CRITICAL ? SLAP_CONTROL_CRITICAL
: SLAP_CONTROL_NONCRITICAL; : SLAP_CONTROL_NONCRITICAL;