Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/correct_password.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/correct_password.c (modified) (1 diff)

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

@@ -29 +29 @@
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <syslog.h>
-#include <ctype.h>
-#include <crypt.h>
-
 #include "libbb.h"
 
+/* Ask the user for a password.
+ * Return 1 if the user gives the correct password for entry PW,
+ * 0 if not.  Return 1 without asking if PW has an empty password.
+ *
+ * NULL pw means "just fake it for login with bad username" */
 
+int correct_password(const struct passwd *pw)
+{
+    char *unencrypted, *encrypted;
+    const char *correct;
 
-/* Ask the user for a password.
-   Return 1 if the user gives the correct password for entry PW,
-   0 if not.  Return 1 without asking for a password if run by UID 0
-   or if PW has an empty password.  */
+    /* fake salt. crypt() can choke otherwise. */
+    correct = "aa";
+    if (!pw) {
+        /* "aa" will never match */
+        goto fake_it;
+    }
+    correct = pw->pw_passwd;
+#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;
+    }
+#endif
 
-int correct_password ( const struct passwd *pw )
-{
-    char *unencrypted, *encrypted, *correct;
-
-#ifdef CONFIG_FEATURE_SHADOWPASSWDS
-    if (( strcmp ( pw-> pw_passwd, "x" ) == 0 ) || ( strcmp ( pw-> pw_passwd, "*" ) == 0 )) {
-        struct spwd *sp = getspnam ( pw-> pw_name );
-
-        if ( !sp )
-            bb_error_msg_and_die ( "\nno valid shadow password" );
-
-        correct = sp-> sp_pwdp;
-    }
-    else
-#endif
-        correct = pw-> pw_passwd;
-
-    if ( correct == 0 || correct[0] == '\0' )
+    if (!correct[0]) /* empty password field? */
         return 1;
 
-    unencrypted = bb_askpass ( 0, "Password: " );
-    if ( !unencrypted )
-    {
+ fake_it:
+    unencrypted = bb_askpass(0, "Password: ");
+    if (!unencrypted) {
         return 0;
     }
-    encrypted = crypt ( unencrypted, correct );
-    memset ( unencrypted, 0, strlen ( unencrypted ));
-    return ( strcmp ( encrypted, correct ) == 0 ) ? 1 : 0;
+    encrypted = crypt(unencrypted, correct);
+    memset(unencrypted, 0, strlen(unencrypted));
+    return strcmp(encrypted, correct) == 0;
 }