Mem context tweaks for bdb_dn2idl

[openldap] / servers / slapd / back-shell / abandon.c

diff --git a/servers/slapd/back-shell/abandon.c b/servers/slapd/back-shell/abandon.c
index dad3204984d0bc6d4a7192f4bfb4f743faf23df6..12f7a74eaeb86223ae2c6cc5fe8bf5bc38fbb823 100644 (file)
--- a/servers/slapd/back-shell/abandon.c
+++ b/servers/slapd/back-shell/abandon.c
@@ -1,9 +1,13 @@
 /* abandon.c - shell backend abandon function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 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>
@@ -11,52 +15,47 @@
 #include "slap.h"
 #include "shell.h"
 
-void
+int
 shell_back_abandon(
-    Backend    *be,
-    Connection *conn,
     Operation  *op,
-    int                msgid
-)
+    SlapReply  *rs )
 {
-       struct shellinfo        *si = (struct shellinfo *) be->be_private;
+       struct shellinfo        *si = (struct shellinfo *) op->o_bd->be_private;
        FILE                    *rfp, *wfp;
        pid_t                   pid;
        Operation               *o;
 
        /* 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( &op->o_conn->c_mutex );
                pid = -1;
-               for ( o = conn->c_ops; o != NULL; o = o->o_next ) {
-                       if ( o->o_msgid == msgid ) {
+               LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
+                       if ( o->o_msgid == op->oq_abandon.rs_msgid ) {
                                pid = (pid_t) o->o_private;
                                break;
                        }
                }
-               ldap_pvt_thread_mutex_unlock( &conn->c_opsmutex );
-
-               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 );
-               }
-               return;
+               ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+       }
+
+       if ( pid == -1 ) {
+               Debug( LDAP_DEBUG_ARGS, "shell could not find op %d\n", op->oq_abandon.rs_msgid, 0, 0 );
+               return 0;
        }
 
        if ( forkandexec( si->si_abandon, &rfp, &wfp ) == -1 ) {
-               return;
+               return 0;
        }
 
        /* write out the request to the abandon process */
        fprintf( wfp, "ABANDON\n" );
-       fprintf( wfp, "msgid: %d\n", msgid );
-       print_suffixes( wfp, be );
+       fprintf( wfp, "msgid: %d\n", op->oq_abandon.rs_msgid );
+       print_suffixes( wfp, op->o_bd );
+       fprintf( wfp, "pid: %ld\n", (long) pid );
        fclose( wfp );
 
        /* no result from abandon */
        fclose( rfp );
+
+       return 0;
 }