Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix check for duplicate gid when '-g =uid' is specified to usermod.

Browse Source 
Closes PR bin/40391
This commit is contained in:
mike 2009-03-20 02:53:47 +00:00
parent 2c9ccd9e54
commit c7f073e0ff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/user/user.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: user.c,v 1.122 2009/03/18 04:59:45 mike Exp $ */ /* $NetBSD: user.c,v 1.123 2009/03/20 02:53:47 mike Exp $ */
/* /*
* Copyright (c) 1999 Alistair G. Crooks. All rights reserved. * Copyright (c) 1999 Alistair G. Crooks. All rights reserved.
@ -33,7 +33,7 @@
#ifndef lint #ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1999\ __COPYRIGHT("@(#) Copyright (c) 1999\
The NetBSD Foundation, Inc. All rights reserved."); The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: user.c,v 1.122 2009/03/18 04:59:45 mike Exp $"); __RCSID("$NetBSD: user.c,v 1.123 2009/03/20 02:53:47 mike Exp $");
#endif #endif
#include <sys/types.h> #include <sys/types.h>
@ -1542,7 +1542,7 @@ moduser(char *login_name, char *newlogin, user_t *up, int allow_samba)
if (up->u_flags & F_GROUP) { if (up->u_flags & F_GROUP) {
/* if -g=uid was specified, check gid is unused */ /* if -g=uid was specified, check gid is unused */
if (strcmp(up->u_primgrp, "=uid") == 0) { if (strcmp(up->u_primgrp, "=uid") == 0) {
if (getgrgid((gid_t)(up->u_uid)) != NULL) { if (getgrgid((gid_t)(pwp->pw_uid)) != NULL) {
(void)close(ptmpfd); (void)close(ptmpfd);
(void)pw_abort(); (void)pw_abort();
errx(EXIT_FAILURE, errx(EXIT_FAILURE,
@ -1550,7 +1550,7 @@ moduser(char *login_name, char *newlogin, user_t *up, int allow_samba)
"gid %d is already in use", "gid %d is already in use",
login_name, up->u_uid); login_name, up->u_uid);
} }
pwp->pw_gid = up->u_uid; pwp->pw_gid = pwp->pw_uid;
} else if ((grp = getgrnam(up->u_primgrp)) != NULL) { } else if ((grp = getgrnam(up->u_primgrp)) != NULL) {
pwp->pw_gid = grp->gr_gid; pwp->pw_gid = grp->gr_gid;
} else if (is_number(up->u_primgrp) && } else if (is_number(up->u_primgrp) &&