1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-lib-1.18.0/root/usr/lib/perl5/site_perl/esmith/util.pm mezzanine_patched_e-smith-lib-1.18.0/root/usr/lib/perl5/site_perl/esmith/util.pm |
2 |
|
|
--- e-smith-lib-1.18.0/root/usr/lib/perl5/site_perl/esmith/util.pm 2007-06-01 13:04:14.000000000 -0600 |
3 |
|
|
+++ mezzanine_patched_e-smith-lib-1.18.0/root/usr/lib/perl5/site_perl/esmith/util.pm 2007-06-01 13:03:57.000000000 -0600 |
4 |
|
|
@@ -565,17 +565,16 @@ |
5 |
|
|
use Crypt::Cracklib; |
6 |
|
|
|
7 |
|
|
$strength ||= 'normal'; |
8 |
|
|
- return 'ok' if ($strength eq 'none'); |
9 |
|
|
|
10 |
|
|
my $reason = 'ok'; |
11 |
|
|
+ $reason = 'it is too short' unless (length($password) > 6); |
12 |
|
|
+ return $reason if ($reason ne 'ok' || $strength eq 'none'); |
13 |
|
|
+ |
14 |
|
|
$reason = 'it does not contain numbers' if (not $password =~ /\d/); |
15 |
|
|
$reason = 'it does not contain uppercase characters' if (not $password =~ /[A-Z]/); |
16 |
|
|
$reason = 'it does not contain lowercase characters' if (not $password =~ /[a-z]/); |
17 |
|
|
$reason = 'it does not contain special characters' if (not $password =~ /\W|_/); |
18 |
|
|
- $reason = 'it is too short' if (not length($password) > 6); |
19 |
|
|
- |
20 |
|
|
- return $reason unless ($reason eq 'ok'); |
21 |
|
|
- return 'ok' unless ($strength eq "strong"); |
22 |
|
|
+ return $reason unless ($reason eq 'ok' || $strength eq 'strong'); |
23 |
|
|
|
24 |
|
|
$reason = fascist_check($password, '/usr/lib/cracklib_dict'); |
25 |
|
|
$reason ||= 'the password check failed'; |