From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 5 Jun 2002 16:53:48 +0000 (+0000)
Subject: Fix up abandon merge.  Hallvard will holler if I get this wrong. :-)
X-Git-Tag: OPENLDAP_REL_ENG_2_MP~19
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e958a4c7808dc8539fc2cf1d8154eb67af533a41;p=openldap

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 9761f23376..3f0f6ed28d 100644
--- 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;
 	}