aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2016-12-02 14:11:20 +0100
committerKarel Zak <kzak@redhat.com>2016-12-02 14:11:20 +0100
commite0383e3e88f4d80454bb67b4e8920126c667d258 (patch)
treee225bd55b780471b64da11dbf0357b6ca8bc1878
parentb439065634e693dda385a6e5269e1d9258d6d471 (diff)
downloadutil-linux-e0383e3e88f4d80454bb67b4e8920126c667d258.tar.gz
wall: check -g GID
Based on comments from Sami Kerola. Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--bash-completion/wall2
-rw-r--r--term-utils/wall.c8
2 files changed, 8 insertions, 2 deletions
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)