X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=loginutils%2Fadduser.c;h=124e177302868e71c7cea6805a64b44f1c5787c3;hb=cea0a8bccbb0d98eb0e7423e6fff0d8529db8efe;hp=a25632e44eb934fa8355f610edffaa709c6e1029;hpb=86f5c9906beac527f3d7966f24811b571a589e08;p=oweals%2Fbusybox.git diff --git a/loginutils/adduser.c b/loginutils/adduser.c index a25632e44..124e17730 100644 --- a/loginutils/adduser.c +++ b/loginutils/adduser.c @@ -8,57 +8,25 @@ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "busybox.h" +#define OPT_DONT_SET_PASS (1 << 4) +#define OPT_DONT_MAKE_HOME (1 << 6) -/* structs __________________________ */ - -typedef struct { - uid_t u; - gid_t g; -} Id; - -/* data _____________________________ */ - -/* defaults : should this be in an external file? */ -static const char default_passwd[] = "x"; -static const char default_gecos[] = "Linux User,,,"; -static const char default_home_prefix[] = "/home"; - -#ifdef CONFIG_FEATURE_SHADOWPASSWDS -/* shadow in use? */ -static int shadow_enabled = 0; -#endif - /* remix */ /* EDR recoded such that the uid may be passed in *p */ static int passwd_study(const char *filename, struct passwd *p) { - struct passwd *pw; + enum { min = 500, max = 65000 }; FILE *passwd; + /* We are using reentrant fgetpwent_r() in order to avoid + * pulling in static buffers from libc (think static build here) */ + char buffer[256]; + struct passwd pw; + struct passwd *result; - const int min = 500; - const int max = 65000; - - passwd = bb_wfopen(filename, "r"); - if (!passwd) - return 4; + passwd = xfopen(filename, "r"); /* EDR if uid is out of bounds, set to min */ if ((p->pw_uid > max) || (p->pw_uid < min)) @@ -68,14 +36,14 @@ static int passwd_study(const char *filename, struct passwd *p) * make sure login isn't taken; * find free uid and gid; */ - while ((pw = fgetpwent(passwd))) { - if (strcmp(pw->pw_name, p->pw_name) == 0) { + while (!fgetpwent_r(passwd, &pw, buffer, sizeof(buffer), &result)) { + if (strcmp(pw.pw_name, p->pw_name) == 0) { /* return 0; */ return 1; } - if ((pw->pw_uid >= p->pw_uid) && (pw->pw_uid < max) - && (pw->pw_uid >= min)) { - p->pw_uid = pw->pw_uid + 1; + if ((pw.pw_uid >= p->pw_uid) && (pw.pw_uid < max) + && (pw.pw_uid >= min)) { + p->pw_uid = pw.pw_uid + 1; } } @@ -100,11 +68,11 @@ static int passwd_study(const char *filename, struct passwd *p) return 0; } -static void addgroup_wrapper(const char *login, gid_t gid) +static void addgroup_wrapper(struct passwd *p) { char *cmd; - cmd = bb_xasprintf("addgroup -g %d \"%s\"", gid, login); + cmd = xasprintf("addgroup -g %d \"%s\"", p->pw_gid, p->pw_name); system(cmd); free(cmd); } @@ -114,97 +82,72 @@ static void passwd_wrapper(const char *login) ATTRIBUTE_NORETURN; static void passwd_wrapper(const char *login) { static const char prog[] = "passwd"; - execlp(prog, prog, login, NULL); - bb_error_msg_and_die("Failed to execute '%s', you must set the password for '%s' manually", prog, login); + BB_EXECLP(prog, prog, login, NULL); + bb_error_msg_and_die("failed to execute '%s', you must set the password for '%s' manually", prog, login); } /* putpwent(3) remix */ -static int adduser(const char *filename, struct passwd *p, int makehome, int setpass) +static int adduser(struct passwd *p) { - FILE *passwd; - int r; -#ifdef CONFIG_FEATURE_SHADOWPASSWDS - FILE *shadow; - struct spwd *sp; -#endif - int new_group = 1; - - /* if using a pre-existing group, don't create one */ - if (p->pw_gid != 0) - new_group = 0; + FILE *file; + int addgroup = !p->pw_gid; /* make sure everything is kosher and setup uid && gid */ - passwd = bb_wfopen(filename, "a"); - if (passwd == NULL) { - return 1; - } - fseek(passwd, 0, SEEK_END); - - /* if (passwd_study(filename, p) == 0) { */ - r = passwd_study(filename, p); - if (r) { - if (r == 1) - bb_error_msg("%s: login already in use", p->pw_name); - else if (r == 2) - bb_error_msg("illegal uid or no uids left"); - else if (r == 3) - bb_error_msg("group name %s already in use", p->pw_name); - else - bb_error_msg("generic error."); - return 1; + file = xfopen(bb_path_passwd_file, "a"); + fseek(file, 0, SEEK_END); + + switch (passwd_study(bb_path_passwd_file, p)) { + case 1: + bb_error_msg_and_die("%s: login already in use", p->pw_name); + case 2: + bb_error_msg_and_die("illegal uid or no uids left"); + case 3: + bb_error_msg_and_die("%s: group name already in use", p->pw_name); } /* add to passwd */ - if (putpwent(p, passwd) == -1) { - return 1; + if (putpwent(p, file) == -1) { + bb_perror_nomsg_and_die(); } - fclose(passwd); + if (ENABLE_FEATURE_CLEAN_UP) + fclose(file); -#ifdef CONFIG_FEATURE_SHADOWPASSWDS +#if ENABLE_FEATURE_SHADOWPASSWDS /* add to shadow if necessary */ - if (shadow_enabled) { - shadow = bb_wfopen(bb_path_shadow_file, "a"); - if (shadow == NULL) { - return 1; - } - fseek(shadow, 0, SEEK_END); - sp = pwd_to_spwd(p); - sp->sp_max = 99999; /* debianish */ - sp->sp_warn = 7; - fprintf(shadow, "%s:!:%ld:%ld:%ld:%ld:::\n", - sp->sp_namp, sp->sp_lstchg, sp->sp_min, sp->sp_max, - sp->sp_warn); - fclose(shadow); + file = fopen_or_warn(bb_path_shadow_file, "a"); + if (file) { + fseek(file, 0, SEEK_END); + fprintf(file, "%s:!:%ld:%d:%d:%d:::\n", + p->pw_name, /* username */ + time(NULL) / 86400, /* sp->sp_lstchg */ + 0, /* sp->sp_min */ + 99999, /* sp->sp_max */ + 7); /* sp->sp_warn */ + if (ENABLE_FEATURE_CLEAN_UP) + fclose(file); } #endif - if (new_group) { - /* add to group */ - /* addgroup should be responsible for dealing w/ gshadow */ - addgroup_wrapper(p->pw_name, p->pw_gid); - } + /* add to group */ + /* addgroup should be responsible for dealing w/ gshadow */ + /* if using a pre-existing group, don't create one */ + if (addgroup) addgroup_wrapper(p); /* Clear the umask for this process so it doesn't * * screw up the permissions on the mkdir and chown. */ umask(0); - - if (makehome) { - /* mkdir */ - if (mkdir(p->pw_dir, 0755)) { - bb_perror_msg("%s", p->pw_dir); - } - /* Set the owner and group so it is owned by the new user. */ - if (chown(p->pw_dir, p->pw_uid, p->pw_gid)) { - bb_perror_msg("%s", p->pw_dir); - } - /* Now fix up the permissions to 2755. Can't do it before now - * since chown will clear the setgid bit */ - if (chmod(p->pw_dir, 02755)) { + if (!(option_mask32 & 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 */ + if (mkdir(p->pw_dir, 0755) + || chown(p->pw_dir, p->pw_uid, p->pw_gid) + || chmod(p->pw_dir, 02755)) { bb_perror_msg("%s", p->pw_dir); } } - if (setpass) { + if (!(option_mask32 & OPT_DONT_SET_PASS)) { /* interactively set passwd */ passwd_wrapper(p->pw_name); } @@ -212,22 +155,6 @@ static int adduser(const char *filename, struct passwd *p, int makehome, int set return 0; } - -/* return current uid (root is always uid == 0, right?) */ -#ifndef CONFIG_ADDGROUP -static inline void if_i_am_not_root(void) -#else -void if_i_am_not_root(void) -#endif -{ - if (geteuid()) { - bb_error_msg_and_die( "Only root may add a user or group to the system."); - } -} - -#define SETPASS (1 << 4) -#define MAKEHOME (1 << 6) - /* * adduser will take a login_name as its first parameter. * @@ -236,66 +163,38 @@ void if_i_am_not_root(void) * gecos * * can be customized via command-line parameters. - * ________________________________________________________________________ */ + */ +int adduser_main(int argc, char **argv); int adduser_main(int argc, char **argv) { struct passwd pw; - const char *login; - const char *gecos = default_gecos; - const char *home = NULL; - const char *shell = DEFAULT_SHELL; - const char *usegroup = NULL; - int flags; - int setpass = 1; - int makehome = 1; - - /* init */ - if (argc < 2) { - bb_show_usage(); - } - /* get args */ - flags = bb_getopt_ulflags(argc, argv, "h:g:s:G:DSH", &home, &gecos, &shell, &usegroup); + const char *usegroup = NULL; - if (flags & SETPASS) { - setpass = 0; - } - if (flags & MAKEHOME) { - makehome = 0; + /* got root? */ + if (geteuid()) { + bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); } - /* got root? */ - if_i_am_not_root(); + pw.pw_gecos = (char *)"Linux User,,,"; + pw.pw_shell = (char *)DEFAULT_SHELL; + pw.pw_dir = NULL; - /* get login */ - if (optind >= argc) { - bb_error_msg_and_die( "no user specified"); - } - login = argv[optind]; + /* check for min, max and missing args and exit on error */ + opt_complementary = "-1:?1:?"; + getopt32(argc, argv, "h:g:s:G:DSH", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup); /* create string for $HOME if not specified already */ - if (!home) { - home = concat_path_file(default_home_prefix, login); + if (!pw.pw_dir) { + snprintf(bb_common_bufsiz1, BUFSIZ, "/home/%s", argv[optind]); + pw.pw_dir = bb_common_bufsiz1; } -#ifdef CONFIG_FEATURE_SHADOWPASSWDS - /* is /etc/shadow in use? */ - shadow_enabled = (0 == access(bb_path_shadow_file, F_OK)); -#endif /* create a passwd struct */ - pw.pw_name = (char *)login; - pw.pw_passwd = (char *)default_passwd; + pw.pw_name = argv[optind]; + pw.pw_passwd = (char *)"x"; pw.pw_uid = 0; - pw.pw_gid = 0; - pw.pw_gecos = (char *)gecos; - pw.pw_dir = (char *)home; - pw.pw_shell = (char *)shell; - - if (usegroup) { - /* Add user to a group that already exists */ - pw.pw_gid = bb_xgetgrnam(usegroup); - /* exits on error */ - } + pw.pw_gid = usegroup ? xgroup2gid(usegroup) : 0; /* exits on failure */ /* grand finale */ - return adduser(bb_path_passwd_file, &pw, makehome, setpass); + return adduser(&pw); }