summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--src/chcon.c1
-rw-r--r--src/runcon.c1
-rwxr-xr-xtests/misc/help-version2
4 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 18d98518c..faf2b1d76 100644
--- 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 4f091a304..01bb4ad69 100644
--- 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 85e5f59b0..418860146 100644
--- 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 25364dfd2..f383fa64d 100755
--- 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