diff options
| author | Chengwei Yang <chengwei.yang@intel.com> | 2014-01-17 15:46:43 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-01-17 16:13:18 +0000 |
| commit | 6fab28dce4785a86ea3f6616ecf6036c43337edd (patch) | |
| tree | 3a745ebb32222eefd49a6c1ccb629963d4438e97 /doc | |
| parent | 7fa1641db049912f59654153d077953714720ca2 (diff) | |
| download | coreutils-6fab28dce4785a86ea3f6616ecf6036c43337edd.tar.xz | |
doc: clarify SMACK related --help and documentation
* src/ls.c: Remove all mention of SELinux since ls
should treat all security context labels equally.
* doc/coreutils.texi (ls invocation): Likewise.
(id invocation): Clarify that -Z outputs the context
inherited by the process, rather than one specific to a user.
Note for SMACK this can be set instead by the SMACK64EXEC label,
in the unusual case where this is set on the id executable.
* src/id.c (usage): Likewise.
* src/mkdir.c (usage): Clarify that -Z is specific to SELinux,
while --context=CTX is also supported for SMACK.
* src/mkfifo.c (usage): Likewise.
* src/mknod.c (usage): Likewise.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/coreutils.texi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 9a19cfa62..35e7bd9fd 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 a security context, but no other alternate access method. A file with any other combination of alternate access methods is marked with a @samp{+} character. @@ -8466,7 +8466,8 @@ to the system default type for destination files, similarly to the @command{restorecon} command. The long form of this option with a specific context specified, will set the context for newly created files only. -With a specified context, if SELinux is disabled, a warning is issued. +With a specified context, if both SELinux and SMACK are disabled, a warning is +issued. @end macro @optContext This option is mutually exclusive with the @option{--preserve=context} @@ -14563,8 +14564,9 @@ Print only the user ID. @opindex --context @cindex SELinux @cindex security context -Print only the security context of the current user. -If SELinux is disabled then print a warning and +Print only the security context of the process, which is generally +the user's security context inherited from the parent process. +If neither SELinux or SMACK is enabled then print a warning and set the exit status to 1. @item -z |