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>
315 lines
9.5 KiB
C
315 lines
9.5 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* adduser - add users to /etc/passwd and /etc/shadow
|
|
*
|
|
* Copyright (C) 1999 by Lineo, inc. and John Beppu
|
|
* Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config ADDUSER
|
|
//config: bool "adduser (15 kb)"
|
|
//config: default y
|
|
//config: select LONG_OPTS
|
|
//config: help
|
|
//config: Utility for creating a new user account.
|
|
//config:
|
|
//config:config FEATURE_CHECK_NAMES
|
|
//config: bool "Enable sanity check on user/group names in adduser and addgroup"
|
|
//config: default n
|
|
//config: depends on ADDUSER || ADDGROUP
|
|
//config: help
|
|
//config: Enable sanity check on user and group names in adduser and addgroup.
|
|
//config: To avoid problems, the user or group name should consist only of
|
|
//config: letters, digits, underscores, periods, at signs and dashes,
|
|
//config: and not start with a dash (as defined by IEEE Std 1003.1-2001).
|
|
//config: For compatibility with Samba machine accounts "$" is also supported
|
|
//config: at the end of the user or group name.
|
|
//config:
|
|
//config:config LAST_ID
|
|
//config: int "Last valid uid or gid for adduser and addgroup"
|
|
//config: depends on ADDUSER || ADDGROUP
|
|
//config: default 60000
|
|
//config: help
|
|
//config: Last valid uid or gid for adduser and addgroup
|
|
//config:
|
|
//config:config FIRST_SYSTEM_ID
|
|
//config: int "First valid system uid or gid for adduser and addgroup"
|
|
//config: depends on ADDUSER || ADDGROUP
|
|
//config: range 0 LAST_ID
|
|
//config: default 100
|
|
//config: help
|
|
//config: First valid system uid or gid for adduser and addgroup
|
|
//config:
|
|
//config:config LAST_SYSTEM_ID
|
|
//config: int "Last valid system uid or gid for adduser and addgroup"
|
|
//config: depends on ADDUSER || ADDGROUP
|
|
//config: range FIRST_SYSTEM_ID LAST_ID
|
|
//config: default 999
|
|
//config: help
|
|
//config: Last valid system uid or gid for adduser and addgroup
|
|
|
|
//applet:IF_ADDUSER(APPLET_NOEXEC(adduser, adduser, BB_DIR_USR_SBIN, BB_SUID_DROP, adduser))
|
|
|
|
//kbuild:lib-$(CONFIG_ADDUSER) += adduser.o
|
|
|
|
//usage:#define adduser_trivial_usage
|
|
//usage: "[OPTIONS] USER [GROUP]"
|
|
//usage:#define adduser_full_usage "\n\n"
|
|
//usage: "Create new user, or add USER to GROUP\n"
|
|
//usage: "\n -h DIR Home directory"
|
|
//usage: "\n -g GECOS GECOS field"
|
|
//usage: "\n -s SHELL Login shell"
|
|
//usage: "\n -G GRP Group"
|
|
//usage: "\n -S Create a system user"
|
|
//usage: "\n -D Don't assign a password"
|
|
//usage: "\n -H Don't create home directory"
|
|
//usage: "\n -u UID User id"
|
|
//usage: "\n -k SKEL Skeleton directory (/etc/skel)"
|
|
|
|
#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_HOME (1 << 0) */ /* unused */
|
|
/* #define OPT_GECOS (1 << 1) */ /* unused */
|
|
#define OPT_SHELL (1 << 2)
|
|
#define OPT_GID (1 << 3)
|
|
#define OPT_DONT_SET_PASS (1 << 4)
|
|
#define OPT_SYSTEM_ACCOUNT (1 << 5)
|
|
#define OPT_DONT_MAKE_HOME (1 << 6)
|
|
#define OPT_UID (1 << 7)
|
|
#define OPT_SKEL (1 << 8)
|
|
|
|
/* remix */
|
|
/* recoded such that the uid may be passed in *p */
|
|
static void passwd_study(struct passwd *p)
|
|
{
|
|
int max = CONFIG_LAST_ID;
|
|
|
|
if (getpwnam(p->pw_name)) {
|
|
bb_error_msg_and_die("%s '%s' in use", "user", p->pw_name);
|
|
/* this format string is reused in adduser and addgroup */
|
|
}
|
|
|
|
if (!(option_mask32 & OPT_UID)) {
|
|
if (option_mask32 & OPT_SYSTEM_ACCOUNT) {
|
|
p->pw_uid = CONFIG_FIRST_SYSTEM_ID;
|
|
max = CONFIG_LAST_SYSTEM_ID;
|
|
} else {
|
|
p->pw_uid = CONFIG_LAST_SYSTEM_ID + 1;
|
|
}
|
|
}
|
|
/* check for a free uid (and maybe gid) */
|
|
while (getpwuid(p->pw_uid) || (p->pw_gid == (gid_t)-1 && getgrgid(p->pw_uid))) {
|
|
if (option_mask32 & OPT_UID) {
|
|
/* -u N, cannot pick uid other than N: error */
|
|
bb_error_msg_and_die("%s '%s' in use", "uid", itoa(p->pw_uid));
|
|
/* this format string is reused in adduser and addgroup */
|
|
}
|
|
if (p->pw_uid == max) {
|
|
bb_error_msg_and_die("no %cids left", 'u');
|
|
/* this format string is reused in adduser and addgroup */
|
|
}
|
|
p->pw_uid++;
|
|
}
|
|
|
|
if (p->pw_gid == (gid_t)-1) {
|
|
p->pw_gid = p->pw_uid; /* new gid = uid */
|
|
if (getgrnam(p->pw_name)) {
|
|
bb_error_msg_and_die("%s '%s' in use", "group", p->pw_name);
|
|
/* this format string is reused in adduser and addgroup */
|
|
}
|
|
}
|
|
}
|
|
|
|
static int addgroup_wrapper(struct passwd *p, const char *group_name)
|
|
{
|
|
char *argv[6];
|
|
|
|
argv[0] = (char*)"addgroup";
|
|
if (group_name) {
|
|
/* Add user to existing group */
|
|
argv[1] = (char*)"--";
|
|
argv[2] = p->pw_name;
|
|
argv[3] = (char*)group_name;
|
|
argv[4] = NULL;
|
|
} else {
|
|
/* Add user to his own group with the first free gid
|
|
* found in passwd_study.
|
|
*/
|
|
argv[1] = (char*)"--gid";
|
|
argv[2] = utoa(p->pw_gid);
|
|
argv[3] = (char*)"--";
|
|
argv[4] = p->pw_name;
|
|
argv[5] = NULL;
|
|
}
|
|
|
|
return spawn_and_wait(argv);
|
|
}
|
|
|
|
static void passwd_wrapper(const char *login_name) NORETURN;
|
|
|
|
static void passwd_wrapper(const char *login_name)
|
|
{
|
|
BB_EXECLP("passwd", "passwd", "--", login_name, NULL);
|
|
bb_error_msg_and_die("can't execute passwd, you must set password manually");
|
|
}
|
|
|
|
//FIXME: upstream adduser has no short options! NOT COMPATIBLE!
|
|
static const char adduser_longopts[] ALIGN1 =
|
|
"home\0" Required_argument "h"
|
|
"gecos\0" Required_argument "g"
|
|
"shell\0" Required_argument "s"
|
|
"ingroup\0" Required_argument "G"
|
|
"disabled-password\0" No_argument "D"
|
|
"empty-password\0" No_argument "D"
|
|
"system\0" No_argument "S"
|
|
"no-create-home\0" No_argument "H"
|
|
"uid\0" Required_argument "u"
|
|
"skel\0" Required_argument "k"
|
|
;
|
|
|
|
/*
|
|
* adduser will take a login_name as its first parameter.
|
|
* home, shell, gecos:
|
|
* can be customized via command-line parameters.
|
|
*/
|
|
int adduser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int adduser_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
struct passwd pw;
|
|
const char *usegroup = NULL;
|
|
char *p;
|
|
unsigned opts;
|
|
char *uid;
|
|
const char *skel = "/etc/skel";
|
|
|
|
/* got root? */
|
|
if (geteuid()) {
|
|
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
|
|
}
|
|
|
|
pw.pw_gecos = (char *)"Linux User,,,";
|
|
/* We assume that newly created users "inherit" root's shell setting */
|
|
pw.pw_shell = (char *)get_shell_name();
|
|
pw.pw_dir = NULL;
|
|
|
|
opts = getopt32long(argv, "^"
|
|
"h:g:s:G:DSHu:k:"
|
|
/* at least one and at most two non-option args */
|
|
/* disable interactive passwd for system accounts */
|
|
"\0" "-1:?2:SD",
|
|
adduser_longopts,
|
|
&pw.pw_dir, &pw.pw_gecos, &pw.pw_shell,
|
|
&usegroup, &uid, &skel
|
|
);
|
|
if (opts & OPT_UID)
|
|
pw.pw_uid = xatou_range(uid, 0, CONFIG_LAST_ID);
|
|
|
|
argv += optind;
|
|
pw.pw_name = argv[0];
|
|
|
|
if (!opts && argv[1]) {
|
|
/* if called with two non-option arguments, adduser
|
|
* will add an existing user to an existing group.
|
|
*/
|
|
return addgroup_wrapper(&pw, argv[1]);
|
|
}
|
|
|
|
/* fill in the passwd struct */
|
|
die_if_bad_username(pw.pw_name);
|
|
if (!pw.pw_dir) {
|
|
/* create string for $HOME if not specified already */
|
|
pw.pw_dir = xasprintf("/home/%s", argv[0]);
|
|
}
|
|
pw.pw_passwd = (char *)"x";
|
|
if (opts & OPT_SYSTEM_ACCOUNT) {
|
|
if (!usegroup) {
|
|
usegroup = "nogroup";
|
|
}
|
|
if (!(opts & OPT_SHELL)) {
|
|
pw.pw_shell = (char *) "/bin/false";
|
|
}
|
|
}
|
|
pw.pw_gid = usegroup ? xgroup2gid(usegroup) : -1; /* exits on failure */
|
|
|
|
/* make sure everything is kosher and setup uid && maybe gid */
|
|
passwd_study(&pw);
|
|
|
|
p = xasprintf("x:%u:%u:%s:%s:%s",
|
|
(unsigned) pw.pw_uid, (unsigned) pw.pw_gid,
|
|
pw.pw_gecos, pw.pw_dir, pw.pw_shell);
|
|
if (update_passwd(bb_path_passwd_file, pw.pw_name, p, NULL) < 0) {
|
|
return EXIT_FAILURE;
|
|
}
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
free(p);
|
|
#if ENABLE_FEATURE_SHADOWPASSWDS
|
|
/* /etc/shadow fields:
|
|
* 1. username
|
|
* 2. encrypted password
|
|
* 3. last password change (unix date (unix time/24*60*60))
|
|
* 4. minimum days required between password changes
|
|
* 5. maximum days password is valid
|
|
* 6. days before password is to expire that user is warned
|
|
* 7. days after password expires that account is disabled
|
|
* 8. unix date when login expires (i.e. when it may no longer be used)
|
|
*/
|
|
/* fields: 2 3 4 5 6 78 */
|
|
p = xasprintf("!:%u:0:99999:7:::", (unsigned)(time(NULL)) / (24*60*60));
|
|
/* ignore errors: if file is missing we suppose admin doesn't want it */
|
|
update_passwd(bb_path_shadow_file, pw.pw_name, p, NULL);
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
free(p);
|
|
#endif
|
|
|
|
/* add to group */
|
|
addgroup_wrapper(&pw, usegroup);
|
|
|
|
/* clear the umask for this process so it doesn't
|
|
* screw up the permissions on the mkdir and chown. */
|
|
umask(0);
|
|
if (!(opts & OPT_DONT_MAKE_HOME)) {
|
|
/* set the owner and group so it is owned by the new user,
|
|
* then fix up the permissions to 2755. Can't do it before
|
|
* since chown will clear the setgid bit */
|
|
int mkdir_err = mkdir(pw.pw_dir, 0755);
|
|
if (mkdir_err == 0) {
|
|
/* New home. Copy /etc/skel to it */
|
|
const char *args[] = {
|
|
"chown",
|
|
"-R",
|
|
xasprintf("%u:%u", (int)pw.pw_uid, (int)pw.pw_gid),
|
|
pw.pw_dir,
|
|
NULL
|
|
};
|
|
/* Be silent on any errors (like: no /etc/skel) */
|
|
if (!(opts & OPT_SKEL))
|
|
logmode = LOGMODE_NONE;
|
|
copy_file(skel, pw.pw_dir, FILEUTILS_RECUR);
|
|
logmode = LOGMODE_STDIO;
|
|
chown_main(4, (char**)args);
|
|
}
|
|
if ((mkdir_err != 0 && errno != EEXIST)
|
|
|| chown(pw.pw_dir, pw.pw_uid, pw.pw_gid) != 0
|
|
|| chmod(pw.pw_dir, 02755) != 0 /* set setgid bit on homedir */
|
|
) {
|
|
bb_simple_perror_msg(pw.pw_dir);
|
|
}
|
|
}
|
|
|
|
if (!(opts & OPT_DONT_SET_PASS)) {
|
|
/* interactively set passwd */
|
|
passwd_wrapper(pw.pw_name);
|
|
}
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|