*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
-
#include "libbb.h"
+#if CONFIG_LAST_SYSTEM_ID < CONFIG_FIRST_SYSTEM_ID
+#error Bad LAST_SYSTEM_ID or FIRST_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)
-
+/* We assume UID_T_MAX == INT_MAX */
/* remix */
-/* EDR recoded such that the uid may be passed in *p */
-static int passwd_study(const char *filename, struct passwd *p)
+/* recoded such that the uid may be passed in *p */
+static void passwd_study(struct passwd *p)
{
- 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;
-
- passwd = xfopen(filename, "r");
-
- /* EDR if uid is out of bounds, set to min */
- if ((p->pw_uid > max) || (p->pw_uid < min))
- p->pw_uid = min;
-
- /* stuff to do:
- * make sure login isn't taken;
- * find free uid and gid;
- */
- while (!fgetpwent_r(passwd, &pw, buffer, sizeof(buffer), &result)) {
- if (strcmp(pw.pw_name, p->pw_name) == 0) {
- /* return 0; */
- return 1;
+ int max = UINT_MAX;
+
+ 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;
+ max = 64999;
}
- if ((pw.pw_uid >= p->pw_uid) && (pw.pw_uid < max)
- && (pw.pw_uid >= min)) {
- p->pw_uid = pw.pw_uid + 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');
+ }
+ p->pw_uid++;
}
- if (p->pw_gid == 0) {
- /* EDR check for an already existing gid */
- while (getgrgid(p->pw_uid) != NULL)
- p->pw_uid++;
-
- /* EDR also check for an existing group definition */
- if (getgrnam(p->pw_name) != NULL)
- return 3;
-
- /* EDR create new gid always = uid */
- p->pw_gid = 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 */
+ }
}
-
- /* EDR bounds check */
- if ((p->pw_uid > max) || (p->pw_uid < min))
- return 2;
-
- /* return 1; */
- return 0;
}
static void addgroup_wrapper(struct passwd *p)
{
char *cmd;
- cmd = xasprintf("addgroup -g %d \"%s\"", p->pw_gid, p->pw_name);
+ cmd = xasprintf("addgroup -g %u '%s'", (unsigned)p->pw_gid, p->pw_name);
system(cmd);
free(cmd);
}
-static void passwd_wrapper(const char *login) ATTRIBUTE_NORETURN;
+static void passwd_wrapper(const char *login) NORETURN;
static void passwd_wrapper(const char *login)
{
- static const char prog[] = "passwd";
+ static const char prog[] ALIGN1 = "passwd";
+
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);
+ bb_error_msg_and_die("can't execute %s, you must set password manually", prog);
}
-/* putpwent(3) remix */
-static int adduser(struct passwd *p)
-{
- FILE *file;
- int addgroup = !p->pw_gid;
-
- /* make sure everything is kosher and setup uid && gid */
- 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, file) == -1) {
- bb_perror_nomsg_and_die();
- }
- /* Do fclose even if !ENABLE_FEATURE_CLEAN_UP.
- * We will exec passwd, files must be flushed & closed before that! */
- fclose(file);
-
-#if ENABLE_FEATURE_SHADOWPASSWDS
- /* add to shadow if necessary */
- 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 */
- fclose(file);
- }
+#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
+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"
+ ;
#endif
- /* 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 (!(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 (!(option_mask32 & OPT_DONT_SET_PASS)) {
- /* interactively set passwd */
- passwd_wrapper(p->pw_name);
- }
-
- return 0;
-}
-
/*
* adduser will take a login_name as its first parameter.
- *
- * home
- * shell
- * gecos
- *
+ * home, shell, gecos:
* can be customized via command-line parameters.
*/
-int adduser_main(int argc, char **argv);
-int adduser_main(int argc, char **argv)
+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;
+
+#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
+ applet_long_options = adduser_longopts;
+#endif
/* got root? */
if (geteuid()) {
pw.pw_dir = NULL;
/* exactly one non-option arg */
- opt_complementary = "=1";
- getopt32(argc, argv, "h:g:s:G:DSH", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup);
+ /* disable interactive passwd for system accounts */
+ opt_complementary = "=1:SD:u+";
+ if (sizeof(pw.pw_uid) == sizeof(int)) {
+ opts = getopt32(argv, "h:g:s:G:DSHu:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &pw.pw_uid);
+ } else {
+ unsigned uid;
+ opts = getopt32(argv, "h:g:s:G:DSHu:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &uid);
+ if (opts & OPT_UID) {
+ pw.pw_uid = uid;
+ }
+ }
argv += optind;
- /* create a passwd struct */
+ /* fill in the passwd struct */
pw.pw_name = argv[0];
+ 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";
- pw.pw_uid = 0;
- pw.pw_gid = usegroup ? xgroup2gid(usegroup) : 0; /* exits on failure */
+ 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);
- /* grand finale */
- return adduser(&pw);
+#if ENABLE_FEATURE_SHADOWPASSWDS
+ p = xasprintf("!:%u:0:99999:7:::", (unsigned)(time(NULL) / 86400)); /* sp->sp_lstchg */
+ /* 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 should be responsible for dealing w/ gshadow */
+ /* if using a pre-existing group, don't create one */
+ if (!usegroup)
+ addgroup_wrapper(&pw);
+
+ /* 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 */
+ if (mkdir(pw.pw_dir, 0755)
+ || chown(pw.pw_dir, pw.pw_uid, pw.pw_gid)
+ || chmod(pw.pw_dir, 02755) /* 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 0;
}
projects / oweals / busybox.git / blobdiff