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>
114 lines
3.4 KiB
C
114 lines
3.4 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* chpasswd.c
|
|
*
|
|
* Written for SLIND (from passwd.c) by Alexander Shishkin <virtuoso@slind.org>
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config CHPASSWD
|
|
//config: bool "chpasswd (18 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: Reads a file of user name and password pairs from standard input
|
|
//config: and uses this information to update a group of existing users.
|
|
//config:
|
|
//config:config FEATURE_DEFAULT_PASSWD_ALGO
|
|
//config: string "Default encryption method (passwd -a, cryptpw -m, chpasswd -c ALG)"
|
|
//config: default "des"
|
|
//config: depends on PASSWD || CRYPTPW || CHPASSWD
|
|
//config: help
|
|
//config: Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
|
|
|
|
//applet:IF_CHPASSWD(APPLET(chpasswd, BB_DIR_USR_SBIN, BB_SUID_DROP))
|
|
|
|
//kbuild:lib-$(CONFIG_CHPASSWD) += chpasswd.o
|
|
|
|
//usage:#define chpasswd_trivial_usage
|
|
//usage: IF_LONG_OPTS("[--md5|--encrypted|--crypt-method]") IF_NOT_LONG_OPTS("[-m|-e|-c]")
|
|
//usage:#define chpasswd_full_usage "\n\n"
|
|
//usage: "Read user:password from stdin and update /etc/passwd\n"
|
|
//usage: IF_LONG_OPTS(
|
|
//usage: "\n -e,--encrypted Supplied passwords are in encrypted form"
|
|
//usage: "\n -m,--md5 Eencrypt using md5, not des"
|
|
//usage: "\n -c,--crypt-method ALG "CRYPT_METHODS_HELP_STR
|
|
//usage: )
|
|
//usage: IF_NOT_LONG_OPTS(
|
|
//usage: "\n -e Supplied passwords are in encrypted form"
|
|
//usage: "\n -m Eencrypt using md5, not des"
|
|
//usage: "\n -c ALG "CRYPT_METHODS_HELP_STR
|
|
//usage: )
|
|
|
|
#include "libbb.h"
|
|
|
|
#if ENABLE_LONG_OPTS
|
|
static const char chpasswd_longopts[] ALIGN1 =
|
|
"encrypted\0" No_argument "e"
|
|
"md5\0" No_argument "m"
|
|
"crypt-method\0" Required_argument "c"
|
|
;
|
|
#endif
|
|
|
|
#define OPT_ENC 1
|
|
#define OPT_MD5 2
|
|
|
|
int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int chpasswd_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
char *name;
|
|
const char *algo = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO;
|
|
int opt;
|
|
|
|
if (getuid() != 0)
|
|
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
|
|
|
|
opt_complementary = "m--ec:e--mc:c--em";
|
|
opt = getopt32long(argv, "emc:", chpasswd_longopts, &algo);
|
|
|
|
while ((name = xmalloc_fgetline(stdin)) != NULL) {
|
|
char *free_me;
|
|
char *pass;
|
|
int rc;
|
|
|
|
pass = strchr(name, ':');
|
|
if (!pass)
|
|
bb_error_msg_and_die("missing new password");
|
|
*pass++ = '\0';
|
|
|
|
xuname2uid(name); /* dies if there is no such user */
|
|
|
|
free_me = NULL;
|
|
if (!(opt & OPT_ENC)) {
|
|
char salt[MAX_PW_SALT_LEN];
|
|
|
|
if (opt & OPT_MD5) {
|
|
/* Force MD5 if the -m flag is set */
|
|
algo = "md5";
|
|
}
|
|
|
|
crypt_make_pw_salt(salt, algo);
|
|
free_me = pass = pw_encrypt(pass, salt, 0);
|
|
}
|
|
|
|
/* This is rather complex: if user is not found in /etc/shadow,
|
|
* we try to find & change his passwd in /etc/passwd */
|
|
#if ENABLE_FEATURE_SHADOWPASSWDS
|
|
rc = update_passwd(bb_path_shadow_file, name, pass, NULL);
|
|
if (rc > 0) /* password in /etc/shadow was updated */
|
|
pass = (char*)"x";
|
|
if (rc >= 0)
|
|
/* 0 = /etc/shadow missing (not an error), >0 = passwd changed in /etc/shadow */
|
|
#endif
|
|
rc = update_passwd(bb_path_passwd_file, name, pass, NULL);
|
|
/* LOGMODE_BOTH logs to syslog also */
|
|
logmode = LOGMODE_BOTH;
|
|
if (rc < 0)
|
|
bb_error_msg_and_die("an error occurred updating password for %s", name);
|
|
if (rc)
|
|
bb_error_msg("password for '%s' changed", name);
|
|
logmode = LOGMODE_STDIO;
|
|
free(name);
|
|
free(free_me);
|
|
}
|
|
return EXIT_SUCCESS;
|
|
}
|