036585a911
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>
163 lines
4.6 KiB
C
163 lines
4.6 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* deluser/delgroup implementation for busybox
|
|
*
|
|
* 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, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config DELUSER
|
|
//config: bool "deluser (8.4 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: Utility for deleting a user account.
|
|
//config:
|
|
//config:config DELGROUP
|
|
//config: bool "delgroup (5.6 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: Utility for deleting a group account.
|
|
//config:
|
|
//config:config FEATURE_DEL_USER_FROM_GROUP
|
|
//config: bool "Support removing users from groups"
|
|
//config: default y
|
|
//config: depends on DELGROUP
|
|
//config: help
|
|
//config: If called with two non-option arguments, deluser
|
|
//config: or delgroup will remove an user from a specified group.
|
|
|
|
// APPLET_NOEXEC:name main location suid_type help
|
|
//applet:IF_DELUSER( APPLET_NOEXEC(deluser, deluser, BB_DIR_USR_SBIN, BB_SUID_DROP, deluser))
|
|
//applet:IF_DELGROUP(APPLET_NOEXEC(delgroup, deluser, BB_DIR_USR_SBIN, BB_SUID_DROP, delgroup))
|
|
|
|
//kbuild:lib-$(CONFIG_DELUSER) += deluser.o
|
|
//kbuild:lib-$(CONFIG_DELGROUP) += deluser.o
|
|
|
|
//usage:#define deluser_trivial_usage
|
|
//usage: IF_LONG_OPTS("[--remove-home] ") "USER"
|
|
//usage:#define deluser_full_usage "\n\n"
|
|
//usage: "Delete USER from the system"
|
|
// --remove-home is self-explanatory enough to put it in --help
|
|
|
|
//usage:#define delgroup_trivial_usage
|
|
//usage: IF_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
|
|
//usage:#define delgroup_full_usage "\n\n"
|
|
//usage: "Delete group GROUP from the system"
|
|
//usage: IF_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
|
|
|
|
#include "libbb.h"
|
|
|
|
int deluser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int deluser_main(int argc, char **argv)
|
|
{
|
|
/* User or group name */
|
|
char *name;
|
|
/* Username (non-NULL only in "delgroup USER GROUP" case) */
|
|
char *member;
|
|
/* Name of passwd or group file */
|
|
const char *pfile;
|
|
/* Name of shadow or gshadow file */
|
|
const char *sfile;
|
|
/* Are we deluser or delgroup? */
|
|
int do_deluser = (ENABLE_DELUSER && (!ENABLE_DELGROUP || applet_name[3] == 'u'));
|
|
|
|
#if !ENABLE_LONG_OPTS
|
|
const int opt_delhome = 0;
|
|
#else
|
|
int opt_delhome = 0;
|
|
if (do_deluser) {
|
|
opt_delhome = getopt32long(argv, "",
|
|
"remove-home\0" No_argument "\xff");
|
|
argv += opt_delhome;
|
|
argc -= opt_delhome;
|
|
}
|
|
#endif
|
|
|
|
if (geteuid() != 0)
|
|
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
|
|
|
|
name = argv[1];
|
|
member = NULL;
|
|
|
|
switch (argc) {
|
|
case 3:
|
|
if (!ENABLE_FEATURE_DEL_USER_FROM_GROUP || do_deluser)
|
|
break;
|
|
/* It's "delgroup USER GROUP" */
|
|
member = name;
|
|
name = argv[2];
|
|
/* Fallthrough */
|
|
|
|
case 2:
|
|
if (do_deluser) {
|
|
/* "deluser USER" */
|
|
struct passwd *pw;
|
|
|
|
pw = xgetpwnam(name); /* bail out if USER is wrong */
|
|
pfile = bb_path_passwd_file;
|
|
if (ENABLE_FEATURE_SHADOWPASSWDS)
|
|
sfile = bb_path_shadow_file;
|
|
if (opt_delhome)
|
|
remove_file(pw->pw_dir, FILEUTILS_RECUR);
|
|
} else {
|
|
struct group *gr;
|
|
do_delgroup:
|
|
/* "delgroup GROUP" or "delgroup USER GROUP" */
|
|
if (do_deluser < 0) { /* delgroup after deluser? */
|
|
gr = getgrnam(name);
|
|
if (!gr)
|
|
return EXIT_SUCCESS;
|
|
} else {
|
|
gr = xgetgrnam(name); /* bail out if GROUP is wrong */
|
|
}
|
|
if (!member) {
|
|
/* "delgroup GROUP" */
|
|
struct passwd *pw;
|
|
/* Check if the group is in use */
|
|
while ((pw = getpwent()) != NULL) {
|
|
if (pw->pw_gid == gr->gr_gid)
|
|
bb_error_msg_and_die("'%s' still has '%s' as their primary group!",
|
|
pw->pw_name, name);
|
|
}
|
|
//endpwent();
|
|
}
|
|
pfile = bb_path_group_file;
|
|
if (ENABLE_FEATURE_SHADOWPASSWDS)
|
|
sfile = bb_path_gshadow_file;
|
|
}
|
|
|
|
/* Modify pfile, then sfile */
|
|
do {
|
|
if (update_passwd(pfile, name, NULL, member) == -1)
|
|
return EXIT_FAILURE;
|
|
if (ENABLE_FEATURE_SHADOWPASSWDS) {
|
|
pfile = sfile;
|
|
sfile = NULL;
|
|
}
|
|
} while (ENABLE_FEATURE_SHADOWPASSWDS && pfile);
|
|
|
|
if (do_deluser > 0) {
|
|
/* Delete user from all groups */
|
|
if (update_passwd(bb_path_group_file, NULL, NULL, name) == -1)
|
|
return EXIT_FAILURE;
|
|
|
|
if (ENABLE_DELGROUP) {
|
|
/* "deluser USER" also should try to delete
|
|
* same-named group. IOW: do "delgroup USER"
|
|
*/
|
|
// On debian deluser is a perl script that calls userdel.
|
|
// From man userdel:
|
|
// If USERGROUPS_ENAB is defined to yes in /etc/login.defs, userdel will
|
|
// delete the group with the same name as the user.
|
|
do_deluser = -1;
|
|
goto do_delgroup;
|
|
}
|
|
}
|
|
return EXIT_SUCCESS;
|
|
}
|
|
/* Reached only if number of command line args is wrong */
|
|
bb_show_usage();
|
|
}
|