diff options
| author | jocuri%softhome.net <> | 2004-03-03 14:19:28 +0100 |
|---|---|---|
| committer | jocuri%softhome.net <> | 2004-03-03 14:19:28 +0100 |
| commit | 261e207c1170cf374467cc422bd76a861110b8ab (patch) | |
| tree | ebaf971d5f25d9eee6a47fee6852dad034477939 | |
| parent | 82303e4a4573a36f43824b96f67785e178563ea5 (diff) | |
| download | bugzilla-261e207c1170cf374467cc422bd76a861110b8ab.tar.gz bugzilla-261e207c1170cf374467cc422bd76a861110b8ab.tar.xz | |
Patch for bug 123077; improve the ValidatePassword sub so that a password change is no longer accepted with a blank second field; r=kiko, a=justdave.
| -rw-r--r-- | globals.pl | 2 | ||||
| -rwxr-xr-x | userprefs.cgi | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/globals.pl b/globals.pl index 9c1b9a7ef..91fd05554 100644 --- a/globals.pl +++ b/globals.pl @@ -706,7 +706,7 @@ sub ValidatePassword { ThrowUserError("password_too_short"); } elsif (length($password) > 16) { ThrowUserError("password_too_long"); - } elsif ($matchpassword && $password ne $matchpassword) { + } elsif ((defined $matchpassword) && ($password ne $matchpassword)) { ThrowUserError("passwords_dont_match"); } } diff --git a/userprefs.cgi b/userprefs.cgi index 017c7c94d..9a1a93717 100755 --- a/userprefs.cgi +++ b/userprefs.cgi @@ -97,9 +97,8 @@ sub SaveAccount { if ($pwd1 ne "" || $pwd2 ne "") { - ($pwd1 eq $pwd2) || ThrowUserError("passwords_dont_match"); $::FORM{'new_password1'} || ThrowUserError("new_password_missing"); - ValidatePassword($pwd1); + ValidatePassword($pwd1, $pwd2); my $cryptedpassword = SqlQuote(Crypt($pwd1)); SendSQL("UPDATE profiles |