Fix up abandon merge. Hallvard will holler if I get this wrong. :-)

diff --git a/servers/slapd/back-shell/abandon.c b/servers/slapd/back-shell/abandon.c
index 9761f23376d82a70c9a5b4e4762e057d79b39925..3f0f6ed28d998aa9f2d8c0ad6e7d77c9763f3553 100644 (file)
--- a/servers/slapd/back-shell/abandon.c
+++ b/servers/slapd/back-shell/abandon.c
@@ -38,22 +38,14 @@ shell_back_abandon(
                                break;
                        }
                }
+               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
        }
-       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
        if ( pid == -1 ) {
                Debug( LDAP_DEBUG_ARGS, "shell could not find op %d\n", msgid, 0, 0 );
                return 0;
        }
 
-       /* no abandon command defined - just kill the process handling it */
-       if ( si->si_abandon == NULL ) {
-               Debug( LDAP_DEBUG_ARGS, "shell killing pid %d\n",
-                              (int) pid, 0, 0 );
-               kill( pid, SIGTERM );
-               return 0;
-       }
-
        if ( forkandexec( si->si_abandon, &rfp, &wfp ) == -1 ) {
                return 0;
        }