coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 2/6] ls: correct document about its security context label


From: Chengwei Yang
Subject: [PATCH 2/6] ls: correct document about its security context label
Date: Thu, 16 Jan 2014 12:44:28 +0800

The implementation is, "." following the file permission mode bits
indicates both SELinux and SMACK access method, so fix the document.

Also in its help info, so the manpage generated from help into.
---
 doc/coreutils.texi |    2 +-
 src/ls.c           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 6b7194a..14d05af 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -7268,7 +7268,7 @@ space, there is no alternate access method.  When it is a 
printing
 character, then there is such a method.
 
 GNU @command{ls} uses a @samp{.} character to indicate a file
-with an SELinux security context, but no other alternate access method.
+with an SELinux or SMACK security context, but no other alternate access 
method.
 
 A file with any other combination of alternate access methods
 is marked with a @samp{+} character.
diff --git a/src/ls.c b/src/ls.c
index 30356ac..7948b20 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -4886,7 +4886,7 @@ Sort entries alphabetically if none of -cftuvSUX nor 
--sort is specified.\n\
   -w, --width=COLS           assume screen width instead of current value\n\
   -x                         list entries by lines instead of by columns\n\
   -X                         sort alphabetically by entry extension\n\
-  -Z, --context              print any SELinux security context of each file\n\
+  -Z, --context              print any SELinux or SMACK security context of 
each file\n\
   -1                         list one file per line\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
-- 
1.7.9.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]