Commit e4567592 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6137

parent 5a868e0d
......@@ -10,6 +10,7 @@ OpenLDAP 2.4.17 Engineering
Added slapd schema checking tool (ITS#6150)
Added slapd writetimeout keyword (ITS#5836)
Fixed slapd assert with closing connections (ITS#6111)
Fixed slapd cancel behavior (ITS#6137)
Fixed slapd cert validation (ITS#6098)
Fixed slapd errno handling (ITS#6037)
Fixed slapd global alloc handling (ITS#6054)
......
......@@ -68,12 +68,14 @@ int cancel_extop( Operation *op, SlapReply *rs )
LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
if ( o->o_msgid == opid ) {
LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, Operation, o_next );
LDAP_STAILQ_NEXT(o, o_next) = NULL;
op->o_conn->c_n_ops_pending--;
slap_op_free( o, NULL );
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
return LDAP_SUCCESS;
/* TODO: We could instead remove the cancelled operation
* from c_pending_ops like Abandon does, and send its
* response here. Not if it is pending because of a
* congested connection though.
*/
rs->sr_text = "too busy for Cancel, try Abandon instead";
return LDAP_CANNOT_CANCEL;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment