* Copyright (C) 1999 by Lineo, inc. and John Beppu
* Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
*
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
#include "libbb.h"
}
}
-static void addgroup_wrapper(struct passwd *p)
+static void addgroup_wrapper(struct passwd *p, const char *group_name)
{
char *cmd;
- cmd = xasprintf("addgroup -g %u '%s'", (unsigned)p->pw_gid, p->pw_name);
+ if (group_name) /* Add user to existing group */
+ cmd = xasprintf("addgroup '%s' '%s'", p->pw_name, group_name);
+ else /* Add user to his own group with the first free gid found in passwd_study */
+ cmd = xasprintf("addgroup -g %u '%s'", (unsigned)p->pw_gid, p->pw_name);
+ /* Warning: to be compatible with external addgroup programs we should use --gid instead */
system(cmd);
free(cmd);
}
static void passwd_wrapper(const char *login)
{
- static const char prog[] ALIGN1 = "passwd";
-
- BB_EXECLP(prog, prog, login, NULL);
- bb_error_msg_and_die("can't execute %s, you must set password manually", prog);
+ BB_EXECLP("passwd", "passwd", login, NULL);
+ bb_error_msg_and_die("can't execute passwd, you must set password manually");
}
#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
#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);
+ addgroup_wrapper(&pw, usegroup);
/* clear the umask for this process so it doesn't
* screw up the permissions on the mkdir and chown. */
/* 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 */
+ 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) */
+ logmode = LOGMODE_NONE;
+ copy_file("/etc/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);
}
passwd_wrapper(pw.pw_name);
}
- return 0;
+ return EXIT_SUCCESS;
}