From: Hallvard Furuseth <hallvard@openldap.org>
Date: Thu, 22 May 2003 19:44:01 +0000 (+0000)
Subject: Send correct pid in 'pid:' line (ITS#2519).
X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~78
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=86ff7f4654351db4a9779cb88e4990536d992780;p=openldap

Send correct pid in 'pid:' line (ITS#2519).
Also don't lock op->o_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 12f7a74eae..040a9993b6 100644
--- a/servers/slapd/back-shell/abandon.c
+++ b/servers/slapd/back-shell/abandon.c
@@ -25,21 +25,21 @@ 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( &op->o_conn->c_mutex );
-		pid = -1;
-		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;
-			}
+		return 0;
+	}
+
+	pid = -1;
+	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( &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 );
+		Debug( LDAP_DEBUG_ARGS, "shell could not find op %ld\n",
+		       (long) op->oq_abandon.rs_msgid, 0, 0 );
 		return 0;
 	}