fuser -k fixed now too

diff --git a/ChangeLog b/ChangeLog
index f9339b66f3822525382c71b155a90aac23aac9a0..511e28eb06995a9a5bea7ba727b5d0aebd05bdb1 100644 (file)
--- 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 999adb2fd4a917f6f4a8bf3da910a1d519638f94..25dd9fd16a8bdbea42a624d2a50f4f1fd23010b2 100644 (file)
--- 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 7a665851f2161abc8e8742d8d1023c894ea94119..dd9a7f2d538dffa6e57ec6c75284eb566dafbaef 100644 (file)
--- 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"