X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=loginutils%2Faddgroup.c;h=f5a99b79636e29f8b0e7071952f30e865e6d4e92;hb=27d07c9ce2f07cf85116455e356ba6c4b57f86fe;hp=1d754af8e0df825dd125ceb0d358ee7fe10cdf97;hpb=f05fd444e83a166e9e7a3fac2996a0e88d35b49f;p=oweals%2Fbusybox.git diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c index 1d754af8e..f5a99b796 100644 --- a/loginutils/addgroup.c +++ b/loginutils/addgroup.c @@ -5,48 +5,15 @@ * Copyright (C) 1999 by Lineo, inc. and John Beppu * Copyright (C) 1999,2000,2001 by John Beppu * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "busybox.h" -#include "pwd_.h" -#include "grp_.h" - - -/* structs __________________________ */ - -/* data _____________________________ */ - -/* defaults : should this be in an external file? */ -static const char default_passwd[] = "x"; - /* make sure gr_name isn't taken, make sure gid is kosher * return 1 on failure */ -static int group_study(const char *filename, struct group *g) +static int group_study(struct group *g) { FILE *etc_group; gid_t desired; @@ -54,16 +21,16 @@ static int group_study(const char *filename, struct group *g) struct group *grp; const int max = 65000; - etc_group = xfopen(filename, "r"); + etc_group = xfopen(bb_path_group_file, "r"); /* make sure gr_name isn't taken, make sure gid is kosher */ desired = g->gr_gid; while ((grp = fgetgrent(etc_group))) { if ((strcmp(grp->gr_name, g->gr_name)) == 0) { - error_msg_and_die("%s: group already in use\n", g->gr_name); + bb_error_msg_and_die("%s: group already in use", g->gr_name); } if ((desired) && grp->gr_gid == desired) { - error_msg_and_die("%d: gid has already been allocated\n", + bb_error_msg_and_die("%d: gid already in use", desired); } if ((grp->gr_gid > g->gr_gid) && (grp->gr_gid < max)) { @@ -83,40 +50,27 @@ static int group_study(const char *filename, struct group *g) } /* append a new user to the passwd file */ -static int addgroup(const char *filename, char *group, gid_t gid, const char *user) +static int addgroup(char *group, gid_t gid, const char *user) { - FILE *etc_group; - -#ifdef CONFIG_FEATURE_SHADOWPASSWDS - FILE *etc_gshadow; - const char *gshadow = gshadow_file; -#endif - + FILE *file; struct group gr; - /* group:passwd:gid:userlist */ - static const char entryfmt[] = "%s:%s:%d:%s\n"; - /* make sure gid and group haven't already been allocated */ gr.gr_gid = gid; gr.gr_name = group; - if (group_study(filename, &gr)) + if (group_study(&gr)) return 1; /* add entry to group */ - etc_group = xfopen(filename, "a"); - - fprintf(etc_group, entryfmt, group, default_passwd, gr.gr_gid, user); - fclose(etc_group); - + file = xfopen(bb_path_group_file, "a"); + /* group:passwd:gid:userlist */ + fprintf(file, "%s:%s:%d:%s\n", group, "x", gr.gr_gid, user); + fclose(file); -#ifdef CONFIG_FEATURE_SHADOWPASSWDS - /* add entry to gshadow if necessary */ - if (access(gshadow, F_OK|W_OK) == 0) { - etc_gshadow = xfopen(gshadow, "a"); - fprintf(etc_gshadow, "%s:!::\n", group); - fclose(etc_gshadow); - } +#if ENABLE_FEATURE_SHADOWPASSWDS + file = xfopen(bb_path_gshadow_file, "a"); + fprintf(file, "%s:!::\n", group); + fclose(file); #endif /* return 1; */ @@ -126,50 +80,29 @@ static int addgroup(const char *filename, char *group, gid_t gid, const char *us /* * addgroup will take a login_name as its first parameter. * - * gid + * gid * * can be customized via command-line parameters. * ________________________________________________________________________ */ int addgroup_main(int argc, char **argv) { - int opt; char *group; - char *user; gid_t gid = 0; + + /* check for min, max and missing args and exit on error */ + bb_opt_complementally = "-1:?2:?"; - /* get remaining args */ - while ((opt = getopt (argc, argv, "g:")) != -1) { - switch (opt) { - case 'g': - gid = strtol(optarg, NULL, 10); - break; - default: - show_usage(); - break; - } + if (bb_getopt_ulflags(argc, argv, "g:", &group)) { + gid = bb_xgetlarg(group, 10, 0, LONG_MAX); } + /* move past the commandline options */ + argv += optind; - if (optind < argc) { - group = argv[optind]; - optind++; - } else { - show_usage(); - } - - if (optind < argc) { - user = argv[optind]; - optind++; - } else { - user = ""; - } - - if (geteuid() != 0) { - error_msg_and_die - ("Only root may add a group to the system."); + /* need to be root */ + if(geteuid()) { + bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); } /* werk */ - return addgroup(group_file, group, gid, user); + return addgroup(argv[0], gid, (argv[1]) ? argv[1] : ""); } - -/* $Id: addgroup.c,v 1.9 2003/01/09 18:53:53 andersen Exp $ */