summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2013-07-02 02:40:35 +0100
committerPádraig Brady <P@draigBrady.com>2013-07-02 09:47:16 +0100
commitb8a87eaf2d6f054473d2dab491ffd4252b6f5b4d (patch)
tree8392f5dbc77939def5597faed0ef6beeeed5aaa6
parent7d5976f668e0799aae1c428a17eb370f06aea1d0 (diff)
downloadcoreutils-b8a87eaf2d6f054473d2dab491ffd4252b6f5b4d.tar.xz
id: don't show SMACK errors unless -Z is specified
* src/id.c (main): Be consistent with the SELinux case, and only show errors in getting the security context when -Z is specified.
-rw-r--r--src/id.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/id.c b/src/id.c
index c91dbcdbc..b7384a7cb 100644
--- a/src/id.c
+++ b/src/id.c
@@ -197,7 +197,7 @@ main (int argc, char **argv)
error (EXIT_FAILURE, 0,
_("cannot print only names or real IDs in default format"));
- /* If we are on a selinux-enabled kernel, no user is specified, and
+ /* If we are on a SELinux/SMACK-enabled kernel, no user is specified, and
either --context is specified or none of (-u,-g,-G) is specified,
and we're not in POSIXLY_CORRECT mode, get our context. Otherwise,
leave the context variable alone - it has been initialized to an
@@ -211,7 +211,8 @@ main (int argc, char **argv)
error (EXIT_FAILURE, 0, _("can't get process context"));
#ifdef HAVE_SMACK
else if (smack_enabled
- && smack_new_label_from_self ((char **) &context) < 0)
+ && smack_new_label_from_self ((char **) &context) < 0
+ && just_context)
error (EXIT_FAILURE, 0, _("can't get process context"));
#endif
}