Operation *o;
/* no abandon command defined - just kill the process handling it */
- if ( IS_NULLCMD( si->si_abandon ) ) {
+ if ( si->si_abandon == NULL ) {
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
pid = -1;
LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
break;
}
}
- if( pid == -1 ) {
- LDAP_STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
- if ( o->o_msgid == msgid ) {
- pid = (pid_t) o->o_private;
- break;
- }
- }
- }
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+ }
- if ( pid != -1 ) {
- Debug( LDAP_DEBUG_ARGS, "shell killing pid %d\n",
- (int) pid, 0, 0 );
- kill( pid, SIGTERM );
- } else {
- Debug( LDAP_DEBUG_ARGS, "shell could not find op %d\n",
- msgid, 0, 0 );
- }
+ if ( pid == -1 ) {
+ Debug( LDAP_DEBUG_ARGS, "shell could not find op %d\n", msgid, 0, 0 );
return 0;
}
/* write out the request to the abandon process */
fprintf( wfp, "ABANDON\n" );
- fprintf( wfp, "opid: %ld/%ld\n", op->o_connid, (long) op->o_msgid );
fprintf( wfp, "msgid: %d\n", msgid );
print_suffixes( wfp, be );
- fprintf( wfp, "abandonid: %ld/%d\n", op->o_connid, msgid );
+ fprintf( wfp, "pid: %ld\n", (long) pid );
fclose( wfp );
/* no result from abandon */