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

if creategid() fails, don't try to print system error message (use errx()

Browse Source 
instead of err()), as all error cases in creategid() are already commented
properly from inside creategid().

This prevents funny errors like:

	miyu# groupadd test2
	miyu# groupadd test2
	groupadd: group `test2' already exists
	groupadd: can't add group: problems with /etc/group file: Inappropriate ioctl for device
This commit is contained in:
hubertf 2001-09-16 18:08:37 +00:00
parent 4242cee2bd
commit 5653bfc431
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.42 2001/09/05 21:37:32 christos Exp $ */
/* $NetBSD: user.c,v 1.43 2001/09/16 18:08:37 hubertf Exp $ */
/*
* Copyright (c) 1999 Alistair G. Crooks. All rights reserved.
@ -35,7 +35,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1999 \
The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: user.c,v 1.42 2001/09/05 21:37:32 christos Exp $");
__RCSID("$NetBSD: user.c,v 1.43 2001/09/16 18:08:37 hubertf Exp $");
#endif
#include <sys/types.h>
@ -1009,7 +1009,7 @@ adduser(char *login, user_t *up)
!creategid(login, gid, login)) {
(void) close(ptmpfd);
(void) pw_abort();
err(EXIT_FAILURE, "can't create gid %d for login name %s", gid, login);
errx(EXIT_FAILURE, "can't create gid %d for login name %s", gid, login);
}
if (up->u_groupc > 0 && !append_group(login, up->u_groupc, up->u_groupv)) {
(void) close(ptmpfd);
@ -1656,7 +1656,7 @@ groupadd(int argc, char **argv)
warnx("warning - invalid group name `%s'", *argv);
}
if (!creategid(*argv, gid, "")) {
err(EXIT_FAILURE, "can't add group: problems with %s file", _PATH_GROUP);
errx(EXIT_FAILURE, "can't add group: problems with %s file", _PATH_GROUP);
}
return EXIT_SUCCESS;
}