From 9eee63a678dfa4079b21b6cf496b7dbbfdf3f7dd Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <jiangshanlai@gmail.com>
Date: Tue, 15 Aug 2017 15:20:24 +0800
Subject: [PATCH] Dont' skip setup group when userid is number

The PR #283 accidently skipped setting the group and caused bug.

Also add the code to set the group if the group is also number.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
---
 src/exec.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/exec.c b/src/exec.c
index ad884568..923cd252 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -210,13 +210,13 @@ static int hyper_setup_exec_user(struct hyper_exec *exec)
 		fprintf(stdout, "try to find the user: %s\n", user);
 		struct passwd *pwd = hyper_getpwnam(user);
 		if (pwd == NULL) {
-			perror("can't find the user");
 			unsigned long id;
-			if (!hyper_name_to_id(user, &id))
+			if (!hyper_name_to_id(user, &id)) {
+				perror("can't find the user");
 				return -1;
+			}
 			uid = id;
-			gid = 0;
-			goto setup;
+			goto get_gid;
 		}
 		uid = pwd->pw_uid;
 		gid = pwd->pw_gid;
@@ -255,15 +255,21 @@ static int hyper_setup_exec_user(struct hyper_exec *exec)
 		}
 	}
 
+get_gid:
 	// get gid
 	if (group) {
 		fprintf(stdout, "try to find the group: %s\n", group);
 		struct group *gr = hyper_getgrnam(group);
 		if (gr == NULL) {
-			perror("can't find the group");
-			goto fail;
+			unsigned long id;
+			if (!hyper_name_to_id(group, &id)) {
+				perror("can't find the group");
+				goto fail;
+			}
+			gid = id;
+		} else {
+			gid = gr->gr_gid;
 		}
-		gid = gr->gr_gid;
 	}
 
 	// append additional groups to supplementary groups
@@ -288,7 +294,6 @@ static int hyper_setup_exec_user(struct hyper_exec *exec)
 		ngroups++;
 	}
 
-setup:
 	// setup the owner of tty
 	if (exec->tty) {
 		char ptmx[512];