/* abandon.c - shell backend abandon function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
#include <stdio.h>
-#include <signal.h>
#include <ac/socket.h>
#include <ac/string.h>
/* no abandon command defined - just kill the process handling it */
if ( si->si_abandon == NULL ) {
- ldap_pvt_thread_mutex_lock( &conn->c_opsmutex );
+ ldap_pvt_thread_mutex_lock( &conn->c_mutex );
pid = -1;
- for ( o = conn->c_ops; o != NULL; o = o->o_next ) {
+ LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
if ( o->o_msgid == msgid ) {
pid = (pid_t) o->o_private;
break;
}
}
- ldap_pvt_thread_mutex_unlock( &conn->c_opsmutex );
+ ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+ }
- if ( pid != -1 ) {
- Debug( LDAP_DEBUG_ARGS, "shell killing pid %d\n", 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;
}
fprintf( wfp, "ABANDON\n" );
fprintf( wfp, "msgid: %d\n", msgid );
print_suffixes( wfp, be );
+ fprintf( wfp, "pid: %ld\n", (long) pid );
fclose( wfp );
/* no result from abandon */