From: Craig Small <csmall@users.sourceforge.net>
Date: Wed, 23 Mar 2005 22:38:00 +0000 (+0000)
Subject: reverted some selinux patches
X-Git-Tag: v22.11~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ce803a1ee8ec69da3a1cb137d8d2fa03be4fc89;p=psmisc

reverted some selinux patches
---

diff --git a/ChangeLog b/ChangeLog
index 75a284a..7797f2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,11 @@ Changes in 21.7
 ===============
 	* Upgraded SELinux code to new api, thanks to Chris PeBenito
 	* define rpmatch for libraries that dont have it
-	* Fixed small typos in help thanks to Benno Schulenberg
+	* Fixed small typos in help, thanks to Benno Schulenberg
 	  fixes SF# 1150042
 	* fusernew - this will be the new fuser once it gets tested on
 	  those strange setups folks out there have
+	* Completed change from Flask to SELinux, thanks to Benno Schulenberg
 
 Changes in 21.6
 ===============
@@ -29,6 +30,7 @@ Changes in 21.6
 	* Fixed --enable-flask logic SF#1094205
 	* Added Norwegian Bokmaal translation
 	* Fixed groff madness with fuser(1) Debian #298199
+	* Added Dutch translation
 
 Changes in 21.5
 ===============
diff --git a/src/killall.c b/src/killall.c
index 9482e15..2c4ece8 100644
--- a/src/killall.c
+++ b/src/killall.c
@@ -409,8 +409,14 @@ usage_pidof (void)
 static void
 usage_killall (void)
 {
+#ifdef WITH_SELINUX
+   fprintf(stderr, _(
+     "Usage: killall [-Z CONTEXT] [ -egiqvw ] [ -SIGNAL ] NAME...\n"));
+#else  /*WITH_SELINUX*/
+  fprintf(stderr, _(
+    "Usage: killall [OPTIONS]... [--] NAME...\n"));
+#endif /*WITH_SELINUX*/
   fprintf(stderr, _(
-    "Usage: killall [OPTIONS]... [--] NAME...\n"
     "       killall -l, --list\n"
     "       killall -V, --version\n\n"
     "  -e,--exact          require exact match for very long names\n"