22542eca18
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
200 lines
6.0 KiB
C
200 lines
6.0 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* addgroup - add groups to /etc/group and /etc/gshadow
|
|
*
|
|
* Copyright (C) 1999 by Lineo, inc. and John Beppu
|
|
* Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
|
|
* Copyright (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*
|
|
*/
|
|
//config:config ADDGROUP
|
|
//config: bool "addgroup (8.2 kb)"
|
|
//config: default y
|
|
//config: select LONG_OPTS
|
|
//config: help
|
|
//config: Utility for creating a new group account.
|
|
//config:
|
|
//config:config FEATURE_ADDUSER_TO_GROUP
|
|
//config: bool "Support adding users to groups"
|
|
//config: default y
|
|
//config: depends on ADDGROUP
|
|
//config: help
|
|
//config: If called with two non-option arguments,
|
|
//config: addgroup will add an existing user to an
|
|
//config: existing group.
|
|
|
|
//applet:IF_ADDGROUP(APPLET_NOEXEC(addgroup, addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP, addgroup))
|
|
|
|
//kbuild:lib-$(CONFIG_ADDGROUP) += addgroup.o
|
|
|
|
//usage:#define addgroup_trivial_usage
|
|
//usage: "[-g GID] [-S] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
|
|
//usage:#define addgroup_full_usage "\n\n"
|
|
//usage: "Add a group" IF_FEATURE_ADDUSER_TO_GROUP(" or add a user to a group") "\n"
|
|
//usage: "\n -g GID Group id"
|
|
//usage: "\n -S Create a system group"
|
|
|
|
#include "libbb.h"
|
|
|
|
#if CONFIG_LAST_SYSTEM_ID < CONFIG_FIRST_SYSTEM_ID
|
|
#error Bad LAST_SYSTEM_ID or FIRST_SYSTEM_ID in .config
|
|
#endif
|
|
#if CONFIG_LAST_ID < CONFIG_LAST_SYSTEM_ID
|
|
#error Bad LAST_ID or LAST_SYSTEM_ID in .config
|
|
#endif
|
|
|
|
#define OPT_GID (1 << 0)
|
|
#define OPT_SYSTEM_ACCOUNT (1 << 1)
|
|
|
|
static void xgroup_study(struct group *g)
|
|
{
|
|
unsigned max = CONFIG_LAST_ID;
|
|
|
|
/* Make sure gr_name is unused */
|
|
if (getgrnam(g->gr_name)) {
|
|
bb_error_msg_and_die("%s '%s' in use", "group", g->gr_name);
|
|
/* these format strings are reused in adduser and addgroup */
|
|
}
|
|
|
|
/* if a specific gid is requested, the --system switch and */
|
|
/* min and max values are overridden, and the range of valid */
|
|
/* gid values is set to [0, INT_MAX] */
|
|
if (!(option_mask32 & OPT_GID)) {
|
|
if (option_mask32 & OPT_SYSTEM_ACCOUNT) {
|
|
g->gr_gid = CONFIG_FIRST_SYSTEM_ID;
|
|
max = CONFIG_LAST_SYSTEM_ID;
|
|
} else {
|
|
g->gr_gid = CONFIG_LAST_SYSTEM_ID + 1;
|
|
}
|
|
}
|
|
/* Check if the desired gid is free
|
|
* or find the first free one */
|
|
while (1) {
|
|
if (!getgrgid(g->gr_gid)) {
|
|
return; /* found free group: return */
|
|
}
|
|
if (option_mask32 & OPT_GID) {
|
|
/* -g N, cannot pick gid other than N: error */
|
|
bb_error_msg_and_die("%s '%s' in use", "gid", itoa(g->gr_gid));
|
|
/* this format strings is reused in adduser and addgroup */
|
|
}
|
|
if (g->gr_gid == max) {
|
|
/* overflowed: error */
|
|
bb_error_msg_and_die("no %cids left", 'g');
|
|
/* this format string is reused in adduser and addgroup */
|
|
}
|
|
g->gr_gid++;
|
|
}
|
|
}
|
|
|
|
/* append a new user to the passwd file */
|
|
static void new_group(char *group, gid_t gid)
|
|
{
|
|
struct group gr;
|
|
char *p;
|
|
|
|
/* make sure gid and group haven't already been allocated */
|
|
gr.gr_gid = gid;
|
|
gr.gr_name = group;
|
|
xgroup_study(&gr);
|
|
|
|
/* add entry to group */
|
|
p = xasprintf("x:%u:", (unsigned) gr.gr_gid);
|
|
if (update_passwd(bb_path_group_file, group, p, NULL) < 0)
|
|
exit(EXIT_FAILURE);
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
free(p);
|
|
#if ENABLE_FEATURE_SHADOWPASSWDS
|
|
/* /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 */
|
|
update_passwd(bb_path_gshadow_file, group, "!::", NULL);
|
|
#endif
|
|
}
|
|
|
|
//FIXME: upstream addgroup has no short options! NOT COMPATIBLE!
|
|
static const char addgroup_longopts[] ALIGN1 =
|
|
"gid\0" Required_argument "g"
|
|
"system\0" No_argument "S"
|
|
;
|
|
|
|
/*
|
|
* addgroup will take a login_name as its first parameter.
|
|
*
|
|
* gid can be customized via command-line parameters.
|
|
* If called with two non-option arguments, addgroup
|
|
* will add an existing user to an existing group.
|
|
*/
|
|
int addgroup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int addgroup_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
unsigned opts;
|
|
const char *gid = "0";
|
|
|
|
/* need to be root */
|
|
if (geteuid()) {
|
|
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
|
|
}
|
|
/* Syntax:
|
|
* addgroup group
|
|
* addgroup --gid num group
|
|
* addgroup user group
|
|
* Check for min, max and missing args */
|
|
opts = getopt32long(argv, "^" "g:S" "\0" "-1:?2", addgroup_longopts,
|
|
&gid
|
|
);
|
|
/* move past the commandline options */
|
|
argv += optind;
|
|
//argc -= optind;
|
|
|
|
#if ENABLE_FEATURE_ADDUSER_TO_GROUP
|
|
if (argv[1]) {
|
|
struct group *gr;
|
|
|
|
if (opts & OPT_GID) {
|
|
/* -g was there, but "addgroup -g num user group"
|
|
* is a no-no */
|
|
bb_show_usage();
|
|
}
|
|
|
|
/* check if group and user exist */
|
|
xuname2uid(argv[0]); /* unknown user: exit */
|
|
gr = xgetgrnam(argv[1]); /* unknown group: exit */
|
|
/* check if user is already in this group */
|
|
for (; *(gr->gr_mem) != NULL; (gr->gr_mem)++) {
|
|
if (strcmp(argv[0], *(gr->gr_mem)) == 0) {
|
|
/* user is already in group: do nothing */
|
|
return EXIT_SUCCESS;
|
|
}
|
|
}
|
|
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
|
|
} else
|
|
#endif /* ENABLE_FEATURE_ADDUSER_TO_GROUP */
|
|
{
|
|
die_if_bad_username(argv[0]);
|
|
new_group(argv[0], xatou_range(gid, 0, CONFIG_LAST_ID));
|
|
}
|
|
/* Reached only on success */
|
|
return EXIT_SUCCESS;
|
|
}
|