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

correct_password: do not print "no shadow passwd..." message

Browse Source 
function                                             old     new   delta
correct_password                                     204     191     -13
.rodata                                           129530  129466     -64
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-77)             Total: -77 bytes
   text    data     bss     dec     hex filename
 675984    2744   13968  692696   a91d8 busybox_old
 675908    2744   13968  692620   a918c busybox_unstripped
This commit is contained in:
Denis Vlasenko 2007-07-03 06:15:42 +00:00
parent 3483e85f6b
commit e190c16636
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libbb/correct_password.c
View File

@ -40,12 +40,6 @@ int correct_password(const struct passwd *pw)
{ {
char *unencrypted, *encrypted; char *unencrypted, *encrypted;
const char *correct; const char *correct;
#if ENABLE_FEATURE_SHADOWPASSWDS
/* Using _r function to avoid pulling in static buffers */
struct spwd spw;
struct spwd *result;
char buffer[256];
#endif
/* fake salt. crypt() can choke otherwise. */ /* fake salt. crypt() can choke otherwise. */
correct = "aa"; correct = "aa";
@ -55,11 +49,14 @@ int correct_password(const struct passwd *pw)
} }
correct = pw->pw_passwd; correct = pw->pw_passwd;
#if ENABLE_FEATURE_SHADOWPASSWDS #if ENABLE_FEATURE_SHADOWPASSWDS
if (LONE_CHAR(pw->pw_passwd, 'x') || LONE_CHAR(pw->pw_passwd, '*')) { if ((correct[0] == 'x' || correct[0] == '*') && !correct[1]) {
if (getspnam_r(pw->pw_name, &spw, buffer, sizeof(buffer), &result)) /* Using _r function to avoid pulling in static buffers */
bb_error_msg("no valid shadow password, checking ordinary one"); struct spwd spw;
else struct spwd *result;
char buffer[256];
if (getspnam_r(pw->pw_name, &spw, buffer, sizeof(buffer), &result) == 0)
correct = spw.sp_pwdp; correct = spw.sp_pwdp;
/* else: no valid shadow password, checking ordinary one */
} }
#endif #endif