diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-11-13 13:06:00 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-11-13 13:06:00 -0800 |
| commit | 2d3ab45cd0b35cb929198e2ad36a1ec9a3b4d93d (patch) | |
| tree | 97bc37e32960f89b299f4b7efa49694e06e95243 /httemplate/edit/process | |
| parent | 156ce177ef4fb53cfcf688b6127a3c4cff9fb83d (diff) | |
| parent | fb5becb1a877994b897e737e983fae2c8da6a5ac (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/edit/process')
| -rwxr-xr-x | httemplate/edit/process/svc_acct.cgi | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi index 9cac2c568..d75ff92c1 100755 --- a/httemplate/edit/process/svc_acct.cgi +++ b/httemplate/edit/process/svc_acct.cgi @@ -81,7 +81,12 @@ if ( $cgi->param('clear_password') eq '*HIDDEN*' || $cgi->param('clear_password') =~ /^\(.* encrypted\)$/ ) { die "fatal: no previous account to recall hidden password from!" unless $old; } else { - $error ||= $new->set_password($cgi->param('clear_password')); + my $newpass = $cgi->param('clear_password'); + if ( ! $old->check_password($newpass) ) { + # then the password is being changed + $error ||= $new->is_password_allowed($newpass) + || $new->set_password($newpass); + } } if ( ! $error ) { |