From: Jim Meyering <meyering@redhat.com>
Date: Fri, 27 Apr 2012 19:30:52 +0000 (+0200)
Subject: id: -Zn/-Zr: avoid an invalid diagnostic
X-Git-Tag: v8.17~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c83f723267dff03e954ba77454d51a691dfba1c0;p=thirdparty%2Fcoreutils.git

id: -Zn/-Zr: avoid an invalid diagnostic

* src/id.c (main): Using -Z with -r or -n would fail with "id: cannot
print only names or real IDs in default format", in spite of that "-Z",
which specifies a non-default format.  Now, it succeeds and ignores
the -n or -r option.  The error was that the test for default_format
was not updated when I added the new --context (-Z) option in
commit v6.9-33-g5320d0f.
---

diff --git a/src/id.c b/src/id.c
index da81422873..158715e2f4 100644
--- a/src/id.c
+++ b/src/id.c
@@ -177,7 +177,8 @@ main (int argc, char **argv)
   if (just_user + just_group + just_group_list + just_context > 1)
     error (EXIT_FAILURE, 0, _("cannot print \"only\" of more than one choice"));
 
-  bool default_format = (just_user + just_group + just_group_list == 0);
+  bool default_format = (just_user + just_group + just_group_list
+                         + just_context == 0);
 
   if (default_format && (use_real || use_name))
     error (EXIT_FAILURE, 0,