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

passwd,chpasswd: reset password in /etc/passwd to "x" if /etc/shadow was updated

Browse Source 
Signed-off-by: Tito Ragusa <farmatito@tiscali.it>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Tito Ragusa 2011-04-05 00:18:33 +02:00 committed by Denys Vlasenko
parent 12140e607c
commit 9eb7bfd4d4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
loginutils/chpasswd.c
View File

@ -67,7 +67,10 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
* we try to find & change his passwd in /etc/passwd */
#if ENABLE_FEATURE_SHADOWPASSWDS
rc = update_passwd(bb_path_shadow_file, name, pass, NULL);
if (rc == 0) /* no lines updated, no errors detected */
if (rc > 0) /* password in /etc/shadow was updated */
pass = (char*)"x";
if (rc >= 0)
/* 0 = /etc/shadow missing (not an error), >0 = passwd changed in /etc/shadow */
#endif
rc = update_passwd(bb_path_passwd_file, name, pass, NULL);
/* LOGMODE_BOTH logs to syslog also */

9
loginutils/passwd.c
View File

@ -184,8 +184,7 @@ int passwd_main(int argc UNUSED_PARAM, char **argv)
* strdup'ing to avoid nasty surprizes */
newp = xstrdup(&pw->pw_passwd[1]);
} else if (opt & OPT_delete) {
//newp = xstrdup("");
newp = (char*)"";
newp = (char*)""; //xstrdup("");
}
rlimit_fsize.rlim_cur = rlimit_fsize.rlim_max = 512L * 30000;
@ -201,7 +200,11 @@ int passwd_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_FEATURE_SHADOWPASSWDS
filename = bb_path_shadow_file;
rc = update_passwd(bb_path_shadow_file, name, newp, NULL);
if (rc == 0) /* no lines updated, no errors detected */
if (rc > 0)
/* password in /etc/shadow was updated */
newp = (char*) "x"; //xstrdup("x");
if (rc >= 0)
/* 0 = /etc/shadow missing (not an error), >0 = passwd changed in /etc/shadow */
#endif
{
filename = bb_path_passwd_file;