add tests for gunzip

[oweals/busybox.git] / libbb / correct_password.c

diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index f832635e6b0331a08cfcf8d19c2f55cb13be0230..f1793cd17399b5992e976d92596dd49327863342 100644 (file)
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -40,12 +40,6 @@ int correct_password(const struct passwd *pw)
 {
        char *unencrypted, *encrypted;
        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. */
        correct = "aa";
@@ -55,15 +49,16 @@ int correct_password(const struct passwd *pw)
        }
        correct = pw->pw_passwd;
 #if ENABLE_FEATURE_SHADOWPASSWDS
-       if (LONE_CHAR(pw->pw_passwd, 'x') || LONE_CHAR(pw->pw_passwd, '*')) {
-               if (getspnam_r(pw->pw_name, &spw, buffer, sizeof(buffer), &result))
-                       bb_error_msg("no valid shadow password, checking ordinary one");
-               else
-                       correct = spw.sp_pwdp;
+       if ((correct[0] == 'x' || correct[0] == '*') && !correct[1]) {
+               /* Using _r function to avoid pulling in static buffers */
+               struct spwd spw;
+               struct spwd *result;
+               char buffer[256];
+               correct = (getspnam_r(pw->pw_name, &spw, buffer, sizeof(buffer), &result)) ? "aa" : spw.sp_pwdp;
        }
 #endif
 
-       if (!correct || correct[0] == '\0')
+       if (!correct[0]) /* empty password field? */
                return 1;
 
  fake_it: