From b8a87eaf2d6f054473d2dab491ffd4252b6f5b4d Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Tue, 2 Jul 2013 02:40:35 +0100 Subject: 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. --- src/id.c | 5 +++-- 1 file 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 } -- cgit v1.2.3-54-g00ecf