diff --git a/contriborbase b/contriborbase deleted file mode 100644 index ef36a67..0000000 --- a/contriborbase +++ /dev/null @@ -1 +0,0 @@ -sme10 diff --git a/root/usr/share/perl5/vendor_perl/esmith/FormMagick.pm b/root/usr/share/perl5/vendor_perl/esmith/FormMagick.pm index 0a3e651..b1d1080 100644 --- a/root/usr/share/perl5/vendor_perl/esmith/FormMagick.pm +++ b/root/usr/share/perl5/vendor_perl/esmith/FormMagick.pm @@ -798,26 +798,7 @@ sub validate_password { my ($fm,$strength,$pass) = @_; - use Crypt::Cracklib; - - my $reason; - - if ($strength eq "none") { - return $fm->localise("Passwords must be at least 7 characters long") unless (length($pass) > 6); - return "OK"; - } - - $reason = $fm->call_fm_validation('password', $pass, undef); - - return $reason unless ($reason eq "OK"); - return "OK" unless ($strength eq "strong"); - - if ( -f '/usr/lib64/cracklib_dict.pwd' ) { - $reason = fascist_check($pass, '/usr/lib64/cracklib_dict'); - } else { - $reason = fascist_check($pass, '/usr/lib/cracklib_dict'); - } - $reason ||= "Software error: password check failed"; + my $reason = esmith::util::validatePassword($pass,$strength); return "OK" if ($reason eq "ok"); diff --git a/smeserver-formmagick.spec b/smeserver-formmagick.spec index 1834ee3..b6b2934 100644 --- a/smeserver-formmagick.spec +++ b/smeserver-formmagick.spec @@ -4,7 +4,7 @@ Summary: smeserver-formmagick Perl modules for web manager i18n %define name smeserver-formmagick Name: %{name} %define version 11.0.0 -%define release 4 +%define release 5 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -22,6 +22,9 @@ BuildArchitectures: noarch Provides: e-smith-formmagick %changelog +* Fri Feb 21 2025 Jean-Philippe Pialasse 11.0.0-5.sme +- password requirement is different in panel and from samba [SME: 12382] + * Wed Apr 17 2024 Jean-Philippe Pialasse 11.0.0-4.sme - rename update event