emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adduser: create a group for net user too

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-10 04:25:05 +01:00
parent 1fbcb805a3
commit 38d3e64d25
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
loginutils/adduser.c
View File

@ -69,8 +69,11 @@ static void addgroup_wrapper(struct passwd *p, const char *group_name)
{ {
char *cmd; char *cmd;
cmd = xasprintf("addgroup '%s' '%s'", if (group_name) /* Add user to existing group */
p->pw_name, group_name); 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); system(cmd);
free(cmd); free(cmd);
} }
@ -79,10 +82,8 @@ static void passwd_wrapper(const char *login) NORETURN;
static void passwd_wrapper(const char *login) static void passwd_wrapper(const char *login)
{ {
static const char prog[] ALIGN1 = "passwd"; BB_EXECLP("passwd", "passwd", login, NULL);
bb_error_msg_and_die("can't execute passwd, you must set password manually");
BB_EXECLP(prog, prog, login, NULL);
bb_error_msg_and_die("can't execute %s, you must set password manually", prog);
} }
#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS #if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
@ -189,10 +190,7 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
#endif #endif
/* add to group */ /* add to group */
/* addgroup should be responsible for dealing w/ gshadow */ addgroup_wrapper(&pw, usegroup);
/* if using a pre-existing group, don't create one */
if (usegroup)
addgroup_wrapper(&pw, usegroup);
/* clear the umask for this process so it doesn't /* clear the umask for this process so it doesn't
* screw up the permissions on the mkdir and chown. */ * screw up the permissions on the mkdir and chown. */
@ -201,9 +199,9 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
/* set the owner and group so it is owned by the new user, /* 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 * then fix up the permissions to 2755. Can't do it before
* since chown will clear the setgid bit */ * since chown will clear the setgid bit */
if (mkdir(pw.pw_dir, 0755) if ((mkdir(pw.pw_dir, 0755) != 0 && errno != EEXIST)
|| chown(pw.pw_dir, pw.pw_uid, pw.pw_gid) || chown(pw.pw_dir, pw.pw_uid, pw.pw_gid) != 0
|| chmod(pw.pw_dir, 02755) /* set setgid bit on homedir */ || chmod(pw.pw_dir, 02755) != 0 /* set setgid bit on homedir */
) { ) {
bb_simple_perror_msg(pw.pw_dir); bb_simple_perror_msg(pw.pw_dir);
} }