reverted some selinux patches

diff --git a/ChangeLog b/ChangeLog
index 75a284adb2e37541ccece8c0ff1a35b549eba315..7797f2d115de831e07f6959c057cb6fc43e3304b 100644 (file)
--- 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 9482e151ef8afb2effba4fb8d0e447ece971867b..2c4ece83a29f33344f4c444fd01688265dfb0134 100644 (file)
--- 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"