--- loncom/interface/loncommon.pm 2019/08/22 00:11:04 1.1075.2.137 +++ loncom/interface/loncommon.pm 2019/08/25 22:56:14 1.1075.2.138 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.1075.2.137 2019/08/22 00:11:04 raeburn Exp $ +# $Id: loncommon.pm,v 1.1075.2.138 2019/08/25 22:56:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3175,16 +3175,17 @@ sub check_passwd_rules { my ($domain,$plainpass) = @_; my %passwdconf = &Apache::lonnet::get_passwdconf($domain); my ($min,$max,@chars,@brokerule,$warning); + $min = $Apache::lonnet::passwdmin; if (ref($passwdconf{'chars'}) eq 'ARRAY') { if ($passwdconf{'min'} =~ /^\d+$/) { - $min = $passwdconf{'min'}; + if ($passwdconf{'min'} > $min) { + $min = $passwdconf{'min'}; + } } if ($passwdconf{'max'} =~ /^\d+$/) { $max = $passwdconf{'max'}; } @chars = @{$passwdconf{'chars'}}; - } else { - $min = 7; } if (($min) && (length($plainpass) < $min)) { push(@brokerule,'min');