From e76d32b0b23f2831c78e33325ebe37dece05651e Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 20 Jul 2013 01:58:52 +0200
Subject: [PATCH] Hopefully fixed "id -G"

---
 src/id.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/id.c b/src/id.c
index 96ae373..e35d53d 100644
--- a/src/id.c
+++ b/src/id.c
@@ -54,11 +54,14 @@ static int _id_error(char const * message, int ret)
 static int _id_G(char const * user, int flagn)
 {
 	struct group * gr;
-	char * u;
+	struct passwd * pw;
+	char * g;
 	char ** p;
 
 	if(user == NULL)
 	{
+		if((pw = getpwuid(geteuid())) == NULL)
+			return _id_error("geteuid", 1);
 		if((gr = getgrgid(getegid())) == NULL)
 			return _id_error("getgrgid", 1);
 		if(getegid() != getgid())
@@ -87,32 +90,34 @@ static int _id_G(char const * user, int flagn)
 	}
 	else
 	{
-		if((gr = getgrnam(user)) == NULL)
+		if((pw = getpwnam(user)) == NULL)
 			return _id_error(user, 1);
+		if((gr = getgrgid(pw->pw_gid)) == NULL)
+			return _id_error("getgrgid", 1);
 		if(flagn == 0)
 			printf("%u", (unsigned)gr->gr_gid);
 		else
-			puts(gr->gr_name);
+			fputs(gr->gr_name, stdout);
 	}
-	if((u = strdup(gr->gr_name)) == NULL)
+	if((g = strdup(gr->gr_name)) == NULL)
 		return _id_error(gr->gr_name, 1);
 	setgrent();
 	for(gr = getgrent(); gr != NULL; gr = getgrent())
 	{
 		for(p = gr->gr_mem; p != NULL && *p != NULL; p++)
 		{
-			if(strcmp(u, *p) == 0)
-			{
-				if(flagn == 0)
-					printf(" %u", (unsigned)gr->gr_gid);
-				else
-					printf(" %s", gr->gr_name);
-			}
+			if(strcmp(pw->pw_name, *p) != 0
+					|| strcmp(g, gr->gr_name) == 0)
+				continue;
+			if(flagn == 0)
+				printf(" %u", (unsigned)gr->gr_gid);
+			else
+				printf(" %s", gr->gr_name);
 		}
 	}
 	putchar('\n');
 	endgrent();
-	free(u);
+	free(g);
 	return 0;
 }