Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/correct_password.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/correct_password.c (modified) (2 diffs)

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

@@ -42 +42 @@
     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. */
     correct = "aa";
@@ -56 +50 @@
     correct = pw->pw_passwd;
 #if ENABLE_FEATURE_SHADOWPASSWDS
+    /* Using _r function to avoid pulling in static buffers */
     if ((correct[0] == 'x' || correct[0] == '*') && !correct[1]) {
+        struct spwd spw;
+        char buffer[256];
         /* getspnam_r may return 0 yet set result to NULL.
          * At least glibc 2.4 does this. Be extra paranoid here. */