diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-08 15:27:06 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-08 15:27:06 +0000 |
commit | 65e14b458892a150681c42bb5837acf68f2d9b60 (patch) | |
tree | 2a9046ae5f3de67d64b0b717383e3c255768263f /libbb | |
parent | bdbbb7ec49040563628758a2581a5f8e44f53277 (diff) | |
download | busybox-w32-65e14b458892a150681c42bb5837acf68f2d9b60.tar.gz busybox-w32-65e14b458892a150681c42bb5837acf68f2d9b60.tar.bz2 busybox-w32-65e14b458892a150681c42bb5837acf68f2d9b60.zip |
login: ask passwords even for wrong usernames.
# size busybox_old busybox_unstripped
text data bss dec hex filename
680099 2704 15648 698451 aa853 busybox_old
680110 2704 15648 698462 aa85e busybox_unstripped
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/correct_password.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libbb/correct_password.c b/libbb/correct_password.c index c515b26af..af6ff076d 100644 --- a/libbb/correct_password.c +++ b/libbb/correct_password.c | |||
@@ -31,9 +31,10 @@ | |||
31 | #include "libbb.h" | 31 | #include "libbb.h" |
32 | 32 | ||
33 | /* Ask the user for a password. | 33 | /* Ask the user for a password. |
34 | Return 1 if the user gives the correct password for entry PW, | 34 | * Return 1 if the user gives the correct password for entry PW, |
35 | 0 if not. Return 1 without asking for a password if run by UID 0 | 35 | * 0 if not. Return 1 without asking if PW has an empty password. |
36 | or if PW has an empty password. */ | 36 | * |
37 | * NULL pw means "just fake it for login with bad username" */ | ||
37 | 38 | ||
38 | int correct_password(const struct passwd *pw) | 39 | int correct_password(const struct passwd *pw) |
39 | { | 40 | { |
@@ -46,6 +47,9 @@ int correct_password(const struct passwd *pw) | |||
46 | char buffer[256]; | 47 | char buffer[256]; |
47 | #endif | 48 | #endif |
48 | 49 | ||
50 | correct = "aa"; /* fake salt. crypt() can choke otherwise */ | ||
51 | if (!pw) | ||
52 | goto fake_it; /* "aa" will never match */ | ||
49 | correct = pw->pw_passwd; | 53 | correct = pw->pw_passwd; |
50 | #if ENABLE_FEATURE_SHADOWPASSWDS | 54 | #if ENABLE_FEATURE_SHADOWPASSWDS |
51 | if (LONE_CHAR(pw->pw_passwd, 'x') || LONE_CHAR(pw->pw_passwd, '*')) { | 55 | if (LONE_CHAR(pw->pw_passwd, 'x') || LONE_CHAR(pw->pw_passwd, '*')) { |
@@ -59,6 +63,7 @@ int correct_password(const struct passwd *pw) | |||
59 | if (!correct || correct[0] == '\0') | 63 | if (!correct || correct[0] == '\0') |
60 | return 1; | 64 | return 1; |
61 | 65 | ||
66 | fake_it: | ||
62 | unencrypted = bb_askpass(0, "Password: "); | 67 | unencrypted = bb_askpass(0, "Password: "); |
63 | if (!unencrypted) { | 68 | if (!unencrypted) { |
64 | return 0; | 69 | return 0; |