From: Craig Small <csmall@users.sourceforge.net>
Date: Mon, 4 Jan 2010 10:39:43 +0000 (+0000)
Subject: fuser -k fixed now too
X-Git-Tag: v22.11~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89273f0027d60cea1261d311db82948343f7d8be;p=psmisc

fuser -k fixed now too
---

diff --git a/ChangeLog b/ChangeLog
index f9339b6..511e28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 Changes in 22.10
 ================
 	* fuser -k -m ... won't kill itself Debian #562767
+	* fuser -NAME fixed SF #2924691, Debian #563388, Gentoo #297423
+	* Added locale.h include for killall on non NLS SF #2922163
+	* Reversed normal file fuser -k check Debian #563387
 
 Changes in 22.9
 ===============
diff --git a/src/fuser.c b/src/fuser.c
index 999adb2..25dd9fd 100644
--- a/src/fuser.c
+++ b/src/fuser.c
@@ -1496,7 +1496,7 @@ kill_matched_proc(struct procs *proc_head, const opt_type opts,
 	for (pptr = proc_head; pptr != NULL; pptr = pptr->next) {
     if ( pptr->pid == mypid)
       continue; /* dont kill myself */
-		if ( pptr->proc_type == PTYPE_NORMAL )
+		if ( pptr->proc_type != PTYPE_NORMAL )
 	    continue;
 		if ((opts & OPT_INTERACTIVE) && (ask(pptr->pid) == 0))
 		  continue;
diff --git a/src/killall.c b/src/killall.c
index 7a66585..dd9a7f2 100644
--- a/src/killall.c
+++ b/src/killall.c
@@ -48,6 +48,10 @@
 #include <selinux/selinux.h>
 #endif /*WITH_SELINUX*/
 
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif /* HAVE_LOCALE_H */
+
 #include "i18n.h"
 #include "comm.h"
 #include "signals.h"