id: do print the AFS-specific nameless group ID (called a PAG)

In 6.11, we mistakenly suppressed the printing of certain group IDs,
thinking they were useless AFS-specific artifacts.
This change reverts that, so now they are printed once again.
http://thread.gmane.org/gmane.org.fsf.announce/867/focus=13345
This also reverts the bug-fix that applied solely to the new code
used to avoid printing those IDs

Revert "id bug fix: don't point to potentially clobbered static storage"
This reverts commit f7d1c59c224f81a8bab5fa2afcaf815988f50467.
Revert "Work around AFS bug: id and groups would print invalid group number."
This reverts commit b7a836c0a3524cda8ef79c30c3fe7ea759ae4656.
Revert "* src/c99-to-c89.diff: Accommodate a C99-ism in id.c."
This reverts commit d44893c5dba4150b4ded9cf6aad316c1ef620c9f.

1 files changed, 3 insertions, 8 deletions

diff --git a/src/id.c b/src/id.c
index a178714fd..e4eda4071 100644
--- a/src/id.c
+++ b/src/id.c
@@ -196,22 +196,17 @@ of a different user"));
     error (EXIT_FAILURE, 0,
 	   _("cannot print only names or real IDs in default format"));
 
-  char const *user_name;
   if (argc - optind == 1)
     {
-      struct passwd const *pwd = getpwnam (argv[optind]);
+      struct passwd *pwd = getpwnam (argv[optind]);
       if (pwd == NULL)
 	error (EXIT_FAILURE, 0, _("%s: No such user"), argv[optind]);
-      user_name = argv[optind];
       ruid = euid = pwd->pw_uid;
       rgid = egid = pwd->pw_gid;
     }
   else
     {
-      struct passwd const *pwd;
       euid = geteuid ();
-      pwd = getpwuid (euid);
-      user_name = pwd ? xstrdup (pwd->pw_name) : NULL;
       ruid = getuid ();
       egid = getegid ();
       rgid = getgid ();
@@ -228,7 +223,7 @@ of a different user"));
     }
   else if (just_group_list)
     {
-      if (!print_group_list (user_name, ruid, rgid, egid, use_name))
+      if (!print_group_list (argv[optind], ruid, rgid, egid, use_name))
 	ok = false;
     }
   else if (just_context)
@@ -237,7 +232,7 @@ of a different user"));
     }
   else
     {
-      print_full_info (user_name);
+      print_full_info (argv[optind]);
     }
   putchar ('\n');