2002-06-05 02:15:46 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
|
|
|
/*
|
2007-04-05 18:46:39 +05:30
|
|
|
* addgroup - add groups to /etc/group and /etc/gshadow
|
2002-06-05 02:15:46 +05:30
|
|
|
*
|
|
|
|
* Copyright (C) 1999 by Lineo, inc. and John Beppu
|
|
|
|
* Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
|
2007-04-05 18:46:39 +05:30
|
|
|
* Copyright (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
|
2002-06-05 02:15:46 +05:30
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2002-06-05 02:15:46 +05:30
|
|
|
*
|
|
|
|
*/
|
2015-10-19 04:50:36 +05:30
|
|
|
//config:config ADDGROUP
|
2017-07-19 01:31:24 +05:30
|
|
|
//config: bool "addgroup (8.2 kb)"
|
2015-10-19 04:50:36 +05:30
|
|
|
//config: default y
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
//config: select LONG_OPTS
|
2015-10-19 04:50:36 +05:30
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Utility for creating a new group account.
|
2015-10-19 04:50:36 +05:30
|
|
|
//config:
|
|
|
|
//config:config FEATURE_ADDUSER_TO_GROUP
|
2017-01-10 19:28:54 +05:30
|
|
|
//config: bool "Support adding users to groups"
|
2015-10-19 04:50:36 +05:30
|
|
|
//config: default y
|
|
|
|
//config: depends on ADDGROUP
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: If called with two non-option arguments,
|
|
|
|
//config: addgroup will add an existing user to an
|
|
|
|
//config: existing group.
|
2015-10-19 04:50:36 +05:30
|
|
|
|
2017-08-07 03:58:15 +05:30
|
|
|
//applet:IF_ADDGROUP(APPLET_NOEXEC(addgroup, addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP, addgroup))
|
2015-10-19 04:50:36 +05:30
|
|
|
|
|
|
|
//kbuild:lib-$(CONFIG_ADDGROUP) += addgroup.o
|
2011-04-02 02:26:30 +05:30
|
|
|
|
|
|
|
//usage:#define addgroup_trivial_usage
|
2014-08-15 17:59:43 +05:30
|
|
|
//usage: "[-g GID] [-S] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
|
2011-04-02 02:26:30 +05:30
|
|
|
//usage:#define addgroup_full_usage "\n\n"
|
2014-08-15 17:59:43 +05:30
|
|
|
//usage: "Add a group" IF_FEATURE_ADDUSER_TO_GROUP(" or add a user to a group") "\n"
|
2011-04-02 02:26:30 +05:30
|
|
|
//usage: "\n -g GID Group id"
|
|
|
|
//usage: "\n -S Create a system group"
|
|
|
|
|
2007-05-27 00:30:18 +05:30
|
|
|
#include "libbb.h"
|
2002-06-05 02:15:46 +05:30
|
|
|
|
2009-05-14 03:53:34 +05:30
|
|
|
#if CONFIG_LAST_SYSTEM_ID < CONFIG_FIRST_SYSTEM_ID
|
|
|
|
#error Bad LAST_SYSTEM_ID or FIRST_SYSTEM_ID in .config
|
|
|
|
#endif
|
2014-01-17 13:47:55 +05:30
|
|
|
#if CONFIG_LAST_ID < CONFIG_LAST_SYSTEM_ID
|
|
|
|
#error Bad LAST_ID or LAST_SYSTEM_ID in .config
|
|
|
|
#endif
|
2009-05-14 03:53:34 +05:30
|
|
|
|
2009-04-23 03:05:52 +05:30
|
|
|
#define OPT_GID (1 << 0)
|
|
|
|
#define OPT_SYSTEM_ACCOUNT (1 << 1)
|
|
|
|
|
2007-04-05 18:46:39 +05:30
|
|
|
static void xgroup_study(struct group *g)
|
2002-06-05 02:15:46 +05:30
|
|
|
{
|
2014-01-17 13:47:55 +05:30
|
|
|
unsigned max = CONFIG_LAST_ID;
|
2009-04-23 03:05:52 +05:30
|
|
|
|
2007-04-05 18:46:39 +05:30
|
|
|
/* Make sure gr_name is unused */
|
|
|
|
if (getgrnam(g->gr_name)) {
|
2009-04-23 03:05:52 +05:30
|
|
|
bb_error_msg_and_die("%s '%s' in use", "group", g->gr_name);
|
|
|
|
/* these format strings are reused in adduser and addgroup */
|
2007-04-05 18:46:39 +05:30
|
|
|
}
|
|
|
|
|
2009-04-23 03:05:52 +05:30
|
|
|
/* if a specific gid is requested, the --system switch and */
|
2009-05-25 07:45:37 +05:30
|
|
|
/* min and max values are overridden, and the range of valid */
|
2009-04-23 03:05:52 +05:30
|
|
|
/* gid values is set to [0, INT_MAX] */
|
|
|
|
if (!(option_mask32 & OPT_GID)) {
|
|
|
|
if (option_mask32 & OPT_SYSTEM_ACCOUNT) {
|
2009-05-14 03:53:34 +05:30
|
|
|
g->gr_gid = CONFIG_FIRST_SYSTEM_ID;
|
|
|
|
max = CONFIG_LAST_SYSTEM_ID;
|
2009-04-23 03:05:52 +05:30
|
|
|
} else {
|
2009-05-14 03:53:34 +05:30
|
|
|
g->gr_gid = CONFIG_LAST_SYSTEM_ID + 1;
|
2009-04-23 03:05:52 +05:30
|
|
|
}
|
|
|
|
}
|
2007-07-30 18:02:37 +05:30
|
|
|
/* Check if the desired gid is free
|
|
|
|
* or find the first free one */
|
|
|
|
while (1) {
|
2007-04-05 18:46:39 +05:30
|
|
|
if (!getgrgid(g->gr_gid)) {
|
2007-07-30 18:02:37 +05:30
|
|
|
return; /* found free group: return */
|
2002-06-05 02:15:46 +05:30
|
|
|
}
|
2009-04-23 03:05:52 +05:30
|
|
|
if (option_mask32 & OPT_GID) {
|
2007-07-30 18:02:37 +05:30
|
|
|
/* -g N, cannot pick gid other than N: error */
|
2009-04-23 03:05:52 +05:30
|
|
|
bb_error_msg_and_die("%s '%s' in use", "gid", itoa(g->gr_gid));
|
|
|
|
/* this format strings is reused in adduser and addgroup */
|
2002-06-05 02:15:46 +05:30
|
|
|
}
|
2009-04-23 03:05:52 +05:30
|
|
|
if (g->gr_gid == max) {
|
2007-07-30 18:02:37 +05:30
|
|
|
/* overflowed: error */
|
2009-04-23 03:05:52 +05:30
|
|
|
bb_error_msg_and_die("no %cids left", 'g');
|
|
|
|
/* this format string is reused in adduser and addgroup */
|
2007-07-30 18:02:37 +05:30
|
|
|
}
|
2009-04-23 03:05:52 +05:30
|
|
|
g->gr_gid++;
|
2007-07-30 18:02:37 +05:30
|
|
|
}
|
2002-06-05 02:15:46 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
/* append a new user to the passwd file */
|
2007-04-05 18:46:39 +05:30
|
|
|
static void new_group(char *group, gid_t gid)
|
2002-06-05 02:15:46 +05:30
|
|
|
{
|
|
|
|
struct group gr;
|
2009-04-14 06:21:05 +05:30
|
|
|
char *p;
|
2002-06-05 02:15:46 +05:30
|
|
|
|
|
|
|
/* make sure gid and group haven't already been allocated */
|
|
|
|
gr.gr_gid = gid;
|
|
|
|
gr.gr_name = group;
|
2007-07-30 18:02:37 +05:30
|
|
|
xgroup_study(&gr);
|
2002-06-05 02:15:46 +05:30
|
|
|
|
|
|
|
/* add entry to group */
|
2009-04-23 03:05:52 +05:30
|
|
|
p = xasprintf("x:%u:", (unsigned) gr.gr_gid);
|
2009-04-14 06:21:05 +05:30
|
|
|
if (update_passwd(bb_path_group_file, group, p, NULL) < 0)
|
|
|
|
exit(EXIT_FAILURE);
|
2007-03-13 18:31:14 +05:30
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
2009-04-14 06:21:05 +05:30
|
|
|
free(p);
|
2006-04-05 00:49:53 +05:30
|
|
|
#if ENABLE_FEATURE_SHADOWPASSWDS
|
2009-07-13 04:57:47 +05:30
|
|
|
/* /etc/gshadow fields:
|
|
|
|
* 1. Group name.
|
|
|
|
* 2. Encrypted password.
|
|
|
|
* If set, non-members of the group can join the group
|
|
|
|
* by typing the password for that group using the newgrp command.
|
|
|
|
* If the value is of this field ! then no user is allowed
|
|
|
|
* to access the group using the newgrp command. A value of !!
|
|
|
|
* is treated the same as a value of ! only it indicates
|
|
|
|
* that a password has never been set before. If the value is null,
|
|
|
|
* only group members can log into the group.
|
|
|
|
* 3. Group administrators (comma delimited list).
|
|
|
|
* Group members listed here can add or remove group members
|
|
|
|
* using the gpasswd command.
|
|
|
|
* 4. Group members (comma delimited list).
|
|
|
|
*/
|
|
|
|
/* Ignore errors: if file is missing we assume admin doesn't want it */
|
2009-04-14 06:21:05 +05:30
|
|
|
update_passwd(bb_path_gshadow_file, group, "!::", NULL);
|
2002-06-05 02:15:46 +05:30
|
|
|
#endif
|
2007-04-05 18:46:39 +05:30
|
|
|
}
|
|
|
|
|
getopt32: remove applet_long_options
FEATURE_GETOPT_LONG made dependent on LONG_OPTS.
The folloving options are removed, now LONG_OPTS enables long options
for affected applets:
FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS
FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS
FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS
FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS
FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS
FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS
They either had a small number of long options, or their long options are
essential.
Example: upstream addgroup and adduser have ONLY longopts,
we should probably go further and get rid
of non-standard short options.
To this end, make addgroup and adduser "select LONG_OPTS".
We had this breakage caused by us even in our own package!
#if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP
/* We try to use --gid, not -g, because "standard" addgroup
* has no short option -g, it has only long --gid.
*/
argv[1] = (char*)"--gid";
#else
/* Breaks if system in fact does NOT use busybox addgroup */
argv[1] = (char*)"-g";
#endif
xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS.
hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime
Shorten help texts by omitting long option when short opt alternative exists.
Reduction of size comes from the fact that store of an immediate
(an address of longopts) to a fixed address (global variable)
is a longer insn than pushing that immediate or passing it in a register.
This effect is CPU-agnostic.
function old new delta
getopt32 1350 22 -1328
vgetopt32 - 1318 +1318
getopt32long - 24 +24
tftpd_main 562 567 +5
scan_recursive 376 380 +4
collect_cpu 545 546 +1
date_main 1096 1095 -1
hostname_main 262 259 -3
uname_main 259 255 -4
setpriv_main 362 358 -4
rmdir_main 191 187 -4
mv_main 562 558 -4
ipcalc_main 548 544 -4
ifenslave_main 641 637 -4
gzip_main 192 188 -4
gunzip_main 77 73 -4
fsfreeze_main 81 77 -4
flock_main 318 314 -4
deluser_main 337 333 -4
cp_main 374 370 -4
chown_main 175 171 -4
applet_long_options 4 - -4
xargs_main 894 889 -5
wget_main 2540 2535 -5
udhcpc_main 2767 2762 -5
touch_main 436 431 -5
tar_main 1014 1009 -5
start_stop_daemon_main 1033 1028 -5
sed_main 682 677 -5
script_main 1082 1077 -5
run_parts_main 330 325 -5
rtcwake_main 459 454 -5
od_main 2169 2164 -5
nl_main 201 196 -5
modprobe_main 773 768 -5
mkdir_main 160 155 -5
ls_main 568 563 -5
install_main 773 768 -5
hwclock_main 411 406 -5
getopt_main 622 617 -5
fstrim_main 256 251 -5
env_main 198 193 -5
dumpleases_main 635 630 -5
dpkg_main 3991 3986 -5
diff_main 1355 1350 -5
cryptpw_main 233 228 -5
cpio_main 593 588 -5
conspy_main 1135 1130 -5
chpasswd_main 313 308 -5
adduser_main 887 882 -5
addgroup_main 416 411 -5
ftpgetput_main 351 345 -6
get_terminal_width_height 242 234 -8
expand_main 690 680 -10
static.expand_longopts 18 - -18
static.unexpand_longopts 27 - -27
mkdir_longopts 28 - -28
env_longopts 30 - -30
static.ifenslave_longopts 34 - -34
mv_longopts 46 - -46
static.rmdir_longopts 48 - -48
packed_usage 31739 31687 -52
------------------------------------------------------------------------------
(add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes
text data bss dec hex filename
915681 485 6880 923046 e15a6 busybox_old
915428 485 6876 922789 e14a5 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2017-08-08 20:08:18 +05:30
|
|
|
//FIXME: upstream addgroup has no short options! NOT COMPATIBLE!
|
2009-04-23 03:05:52 +05:30
|
|
|
static const char addgroup_longopts[] ALIGN1 =
|
|
|
|
"gid\0" Required_argument "g"
|
|
|
|
"system\0" No_argument "S"
|
|
|
|
;
|
|
|
|
|
2002-06-05 02:15:46 +05:30
|
|
|
/*
|
|
|
|
* addgroup will take a login_name as its first parameter.
|
|
|
|
*
|
2007-03-13 18:31:14 +05:30
|
|
|
* gid can be customized via command-line parameters.
|
2007-07-30 18:02:37 +05:30
|
|
|
* If called with two non-option arguments, addgroup
|
2007-04-05 18:46:39 +05:30
|
|
|
* will add an existing user to an existing group.
|
2007-03-13 18:31:14 +05:30
|
|
|
*/
|
2007-10-11 15:35:36 +05:30
|
|
|
int addgroup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2008-07-05 14:48:54 +05:30
|
|
|
int addgroup_main(int argc UNUSED_PARAM, char **argv)
|
2002-06-05 02:15:46 +05:30
|
|
|
{
|
2009-04-23 03:05:52 +05:30
|
|
|
unsigned opts;
|
2014-01-17 13:47:55 +05:30
|
|
|
const char *gid = "0";
|
2006-09-17 21:58:10 +05:30
|
|
|
|
2007-07-30 18:02:37 +05:30
|
|
|
/* need to be root */
|
|
|
|
if (geteuid()) {
|
|
|
|
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
|
|
|
|
}
|
|
|
|
/* Syntax:
|
|
|
|
* addgroup group
|
2017-08-09 01:25:02 +05:30
|
|
|
* addgroup --gid num group
|
2007-07-30 18:02:37 +05:30
|
|
|
* addgroup user group
|
|
|
|
* Check for min, max and missing args */
|
2017-08-09 01:25:02 +05:30
|
|
|
opts = getopt32long(argv, "^" "g:S" "\0" "-1:?2", addgroup_longopts,
|
|
|
|
&gid
|
|
|
|
);
|
2006-04-05 00:49:53 +05:30
|
|
|
/* move past the commandline options */
|
|
|
|
argv += optind;
|
2008-03-17 14:39:09 +05:30
|
|
|
//argc -= optind;
|
2002-06-05 02:15:46 +05:30
|
|
|
|
2007-04-05 18:46:39 +05:30
|
|
|
#if ENABLE_FEATURE_ADDUSER_TO_GROUP
|
2008-03-17 14:39:09 +05:30
|
|
|
if (argv[1]) {
|
2007-04-05 18:46:39 +05:30
|
|
|
struct group *gr;
|
2007-05-30 05:59:55 +05:30
|
|
|
|
2009-04-23 03:05:52 +05:30
|
|
|
if (opts & OPT_GID) {
|
2007-07-30 18:02:37 +05:30
|
|
|
/* -g was there, but "addgroup -g num user group"
|
|
|
|
* is a no-no */
|
|
|
|
bb_show_usage();
|
|
|
|
}
|
|
|
|
|
2007-04-05 18:46:39 +05:30
|
|
|
/* check if group and user exist */
|
|
|
|
xuname2uid(argv[0]); /* unknown user: exit */
|
2008-12-05 21:53:06 +05:30
|
|
|
gr = xgetgrnam(argv[1]); /* unknown group: exit */
|
2007-04-05 18:46:39 +05:30
|
|
|
/* check if user is already in this group */
|
|
|
|
for (; *(gr->gr_mem) != NULL; (gr->gr_mem)++) {
|
2016-11-28 05:52:57 +05:30
|
|
|
if (strcmp(argv[0], *(gr->gr_mem)) == 0) {
|
2007-04-05 18:46:39 +05:30
|
|
|
/* user is already in group: do nothing */
|
|
|
|
return EXIT_SUCCESS;
|
|
|
|
}
|
|
|
|
}
|
2009-04-14 06:21:05 +05:30
|
|
|
if (update_passwd(bb_path_group_file, argv[1], NULL, argv[0]) < 0) {
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
# if ENABLE_FEATURE_SHADOWPASSWDS
|
|
|
|
update_passwd(bb_path_gshadow_file, argv[1], NULL, argv[0]);
|
|
|
|
# endif
|
2007-04-05 18:46:39 +05:30
|
|
|
} else
|
|
|
|
#endif /* ENABLE_FEATURE_ADDUSER_TO_GROUP */
|
2008-03-20 04:45:26 +05:30
|
|
|
{
|
|
|
|
die_if_bad_username(argv[0]);
|
2014-01-17 13:47:55 +05:30
|
|
|
new_group(argv[0], xatou_range(gid, 0, CONFIG_LAST_ID));
|
2008-03-20 04:45:26 +05:30
|
|
|
}
|
2007-04-05 18:46:39 +05:30
|
|
|
/* Reached only on success */
|
|
|
|
return EXIT_SUCCESS;
|
2002-06-05 02:15:46 +05:30
|
|
|
}
|