chcon, runcon: make --help print the bug-reporting address

* src/chcon.c (usage): Use emit_bug_reporting_address.
* src/runcon.c (usage): Likewise.
* tests/misc/help-version: Don't exempt chcon and runcon.
* NEWS: Mention this.

diff --git a/NEWS b/NEWS
index 18d98518c274158599eba600ddcff040d7be4d10..faf2b1d761264cbd709fa74763661736d1021112 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ GNU coreutils NEWS                                    -*- outline -*-
 
 ** Bug fixes
 
+  chcon, runcon: --help output now includes the bug-reporting address
+
   id with no options now prints the SELinux context only when invoked
   with no USERNAME argument.
 

diff --git a/src/chcon.c b/src/chcon.c
index 4f091a304b2bdb0295121992e9f9b00df14a7412..01bb4ad69321febc765b39045a9270e510327d08 100644 (file)
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -400,6 +400,7 @@ one takes effect.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/runcon.c b/src/runcon.c
index 85e5f59b002fd29e05c53d1564ad3b497dbcdbae..418860146ca7d1b63e357c26f8fcc1dc76f74a20 100644 (file)
--- a/src/runcon.c
+++ b/src/runcon.c
@@ -85,6 +85,7 @@ With neither CONTEXT nor COMMAND, print the current security context.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/tests/misc/help-version b/tests/misc/help-version
index 25364dfd237446ebe3a8a1ec96f8faf0cb80405a..f383fa64de2cf3e3defe75e2c7f80765574e596f 100755 (executable)
--- a/tests/misc/help-version
+++ b/tests/misc/help-version
@@ -47,8 +47,6 @@ for lang in C fr da; do
 
     # Skip `test'; it doesn't accept --help or --version.
     test $i = test && continue;
-    test $i = chcon && continue;
-    test $i = runcon && continue;
 
     # false fails even when invoked with --help or --version.
     if test $i = false; then