1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm |
2 |
--- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm 2008-01-06 05:03:30.000000000 -0700 |
3 |
+++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/system_password.pm 2008-01-06 05:00:59.000000000 -0700 |
4 |
@@ -105,23 +105,15 @@ |
5 |
gettext(" it is too simplistic/systematic"); |
6 |
gettext(" it is based on a dictionary word"); |
7 |
gettext(" it is based on a (reversed) dictionary word"); |
8 |
+ gettext(" it does not contain numbers"); |
9 |
+ gettext(" it does not contain uppercase characters"); |
10 |
+ gettext(" it does not contain lowercase characters"); |
11 |
+ gettext(" it does not contain special characters"); |
12 |
#-------------------------------------------------------- |
13 |
|
14 |
- my $reason; |
15 |
- $_ = $choice1; |
16 |
- if (length($_) < 7) |
17 |
- { |
18 |
- $reason = "it is too short"; |
19 |
- } |
20 |
- elsif (!(/\d/ and /[A-Z]/ and /[a-z]/ and /\W/)) |
21 |
- { |
22 |
- $reason = "it is too simplistic/systematic"; |
23 |
- } |
24 |
- if ( -f '/usr/lib64/cracklib_dict.hwm' ) { |
25 |
- $reason ||= fascist_check($choice1, '/usr/lib64/cracklib_dict'); |
26 |
- } else { |
27 |
- $reason ||= fascist_check($choice1, '/usr/lib/cracklib_dict'); |
28 |
- } |
29 |
+ my $strength = $db->get_prop("passwordstrength", "Admin"); |
30 |
+ my $reason = esmith::util::validatePassword($choice1,$strength); |
31 |
+ |
32 |
# Untaint return data from cracklib, so we can use it later. We |
33 |
# trust the library, so we accept anything. |
34 |
$reason =~ /(.+)/; $reason = $1; |