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

adduser: close /etc/{passwd,shadow} before calling passwd etc.

Browse Source 
Spotted by Natanael Copa <natanael.copa@gmail.com>
This commit is contained in:
Denis Vlasenko 2007-07-14 22:51:28 +00:00
parent 59a1f30450
commit 39125bec38
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
loginutils/adduser.c
View File

@ -109,8 +109,9 @@ static int adduser(struct passwd *p)
if (putpwent(p, file) == -1) { if (putpwent(p, file) == -1) {
bb_perror_nomsg_and_die(); bb_perror_nomsg_and_die();
} }
if (ENABLE_FEATURE_CLEAN_UP) /* Do fclose even if !ENABLE_FEATURE_CLEAN_UP.
fclose(file); * We will exec passwd, files must be flushed & closed before that! */
fclose(file);
#if ENABLE_FEATURE_SHADOWPASSWDS #if ENABLE_FEATURE_SHADOWPASSWDS
/* add to shadow if necessary */ /* add to shadow if necessary */
@ -123,8 +124,7 @@ static int adduser(struct passwd *p)
0, /* sp->sp_min */ 0, /* sp->sp_min */
99999, /* sp->sp_max */ 99999, /* sp->sp_max */
7); /* sp->sp_warn */ 7); /* sp->sp_warn */
if (ENABLE_FEATURE_CLEAN_UP) fclose(file);
fclose(file);
} }
#endif #endif
@ -134,7 +134,7 @@ static int adduser(struct passwd *p)
if (addgroup) addgroup_wrapper(p); if (addgroup) addgroup_wrapper(p);
/* 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. */
umask(0); umask(0);
if (!(option_mask32 & OPT_DONT_MAKE_HOME)) { if (!(option_mask32 & OPT_DONT_MAKE_HOME)) {
/* 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,