Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/correct_password.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/correct_password.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/libbb/correct_password.c

@@ -37 +37 @@
  * NULL pw means "just fake it for login with bad username" */
 
-int correct_password(const struct passwd *pw)
+int FAST_FUNC correct_password(const struct passwd *pw)
 {
     char *unencrypted, *encrypted;
     const char *correct;
+    int r;
+#if ENABLE_FEATURE_SHADOWPASSWDS
+    /* Using _r function to avoid pulling in static buffers */
+    struct spwd spw;
+    char buffer[256];
+#endif
 
     /* fake salt. crypt() can choke otherwise. */
@@ -51 +57 @@
 #if ENABLE_FEATURE_SHADOWPASSWDS
     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;
+        /* getspnam_r may return 0 yet set result to NULL.
+         * At least glibc 2.4 does this. Be extra paranoid here. */
+        struct spwd *result = NULL;
+        r = getspnam_r(pw->pw_name, &spw, buffer, sizeof(buffer), &result);
+        correct = (r || !result) ? "aa" : result->sp_pwdp;
     }
 #endif
@@ -63 +69 @@
 
  fake_it:
-    unencrypted = bb_askpass(0, "Password: ");
+    unencrypted = bb_ask_stdin("Password: ");
     if (!unencrypted) {
         return 0;
     }
-    encrypted = crypt(unencrypted, correct);
+    encrypted = pw_encrypt(unencrypted, correct, 1);
+    r = (strcmp(encrypted, correct) == 0);
+    free(encrypted);
     memset(unencrypted, 0, strlen(unencrypted));
-    return strcmp(encrypted, correct) == 0;
+    return r;
 }