From: Hallvard Furuseth <hallvard@openldap.org>
Date: Fri, 23 May 2003 12:45:18 +0000 (+0000)
Subject: Send correct pid in 'pid:' line (ITS#2519).
X-Git-Tag: OPENLDAP_REL_ENG_2_1_21~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7b092f9f695f1cb9d8adc922ac7fa5a4cde7e36;p=thirdparty%2Fopenldap.git

Send correct pid in 'pid:' line (ITS#2519).
Also don't lock conn->c_mutex.  It is already locked by slapd/abandon.c.
---

diff --git a/servers/slapd/back-shell/abandon.c b/servers/slapd/back-shell/abandon.c
index 801b16c6f1..0f2169f4db 100644
--- a/servers/slapd/back-shell/abandon.c
+++ b/servers/slapd/back-shell/abandon.c
@@ -28,17 +28,16 @@ shell_back_abandon(
 	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_mutex );
-		pid = -1;
-		LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
-			if ( o->o_msgid == msgid ) {
-				pid = (pid_t) o->o_private;
-				break;
-			}
+		return 0;
+	}
+
+	pid = -1;
+	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_mutex );
 	}
 
 	if ( pid == -1 ) {