From: Karel Zak <kzak@redhat.com>
Date: Fri, 2 Dec 2016 13:11:20 +0000 (+0100)
Subject: wall: check -g GID
X-Git-Tag: v2.30-rc1~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0383e3e88f4d80454bb67b4e8920126c667d258;p=thirdparty%2Futil-linux.git

wall: check -g GID

Based on comments from Sami Kerola.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/bash-completion/wall b/bash-completion/wall
index 1331e6aebb..d2fba9ad58 100644
--- a/bash-completion/wall
+++ b/bash-completion/wall
@@ -19,7 +19,7 @@ _wall_module()
 	esac
 	case $cur in
 		-*)
-			OPTS="--nobanner --timeout --version --help"
+			OPTS="--group --nobanner --timeout --version --help"
 			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
 			return 0
 			;;
diff --git a/term-utils/wall.c b/term-utils/wall.c
index 7eee88c902..2c1697c3b8 100644
--- a/term-utils/wall.c
+++ b/term-utils/wall.c
@@ -109,10 +109,16 @@ struct group_workspace {
 static gid_t get_group_gid(const char *optarg)
 {
 	struct group *gr;
+	gid_t gid;
 
 	if ((gr = getgrnam(optarg)))
 		return gr->gr_gid;
-	return strtou64_or_err(optarg, _("invalid group argument"));
+
+	gid = strtou32_or_err(optarg, _("invalid group argument"));
+	if (!getgrgid(gid))
+		errx(EXIT_FAILURE, _("%s: unknown gid"), optarg);
+
+	return gid;
 }
 
 static struct group_workspace *init_group_workspace(const char *optarg)