diff options
| author | Ricardo Mestre <mestre@cvs.openbsd.org> | 2016-11-30 10:42:39 +0000 |
|---|---|---|
| committer | Ricardo Mestre <mestre@cvs.openbsd.org> | 2016-11-30 10:42:39 +0000 |
| commit | ac252ce1da1618c50b7b39f9f2dea08e540cfaae (patch) | |
| tree | 9d16c970596fcb6cf4481e3a760dfcc396b6d1f2 /usr.sbin/user/user.c | |
| parent | dd04d10e33a00d3fddecdc5cf598083b8bb0a4ee (diff) | |
According to usermod(8) manpage if -g =uid is used it should create a new group
with an unique UID, if it's not already created (not in the manpage), but this
wasn't implemented.
This implements that functionality similar to what NetBSD has, but with some
corrections by adding a fd closure in case of failure and on the failure
message itself which they got it wrong.
OK tb@
Diffstat (limited to 'usr.sbin/user/user.c')
| -rw-r--r-- | usr.sbin/user/user.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c index 6d848bd0b1e..976b28f73b3 100644 --- a/usr.sbin/user/user.c +++ b/usr.sbin/user/user.c @@ -1,4 +1,4 @@ -/* $OpenBSD: user.c,v 1.115 2016/11/29 16:11:44 deraadt Exp $ */ +/* $OpenBSD: user.c,v 1.116 2016/11/30 10:42:38 mestre Exp $ */ /* $NetBSD: user.c,v 1.69 2003/04/14 17:40:07 agc Exp $ */ /* @@ -1496,12 +1496,20 @@ moduser(char *login_name, char *newlogin, user_t *up) if (up->u_flags & F_GROUP) { /* if -g=uid was specified, check gid is unused */ if (strcmp(up->u_primgrp, "=uid") == 0) { - if (getgrgid((gid_t)(up->u_uid)) != NULL) { + if (getgrgid((gid_t)(pwp->pw_uid)) != NULL) { close(ptmpfd); pw_abort(); - errx(EXIT_FAILURE, "gid %u is already in use", up->u_uid); + errx(EXIT_FAILURE, "gid %u is already " + "in use", pwp->pw_uid); + } + pwp->pw_gid = pwp->pw_uid; + if (!creategid(newlogin, pwp->pw_uid, "")) { + close(ptmpfd); + pw_abort(); + errx(EXIT_FAILURE, "could not create " + "group %s with uid %u", newlogin, + pwp->pw_uid); } - pwp->pw_gid = up->u_uid; } else { if ((grp = find_group_info(up->u_primgrp)) == NULL) { close(ptmpfd); |