Commit 0447f163 authored by terry%netscape.com's avatar terry%netscape.com

Fixed bug 1083 -- was some stupid problems with creating a new account.

parent 724bc93a
...@@ -224,7 +224,11 @@ sub PasswordForLogin { ...@@ -224,7 +224,11 @@ sub PasswordForLogin {
my ($login) = (@_); my ($login) = (@_);
SendSQL("select cryptpassword from profiles where login_name = " . SendSQL("select cryptpassword from profiles where login_name = " .
SqlQuote($login)); SqlQuote($login));
return FetchOneColumn(); my $result = FetchOneColumn();
if (!defined $result) {
$result = "";
}
return $result;
} }
sub confirm_login { sub confirm_login {
...@@ -253,7 +257,6 @@ sub confirm_login { ...@@ -253,7 +257,6 @@ sub confirm_login {
exit; exit;
} }
my $realcryptpwd = PasswordForLogin($::FORM{"Bugzilla_login"}); my $realcryptpwd = PasswordForLogin($::FORM{"Bugzilla_login"});
my $enteredcryptpwd = crypt($enteredpwd, substr($realcryptpwd, 0, 2));
if (defined $::FORM{"PleaseMailAPassword"}) { if (defined $::FORM{"PleaseMailAPassword"}) {
my $realpwd; my $realpwd;
...@@ -264,6 +267,7 @@ sub confirm_login { ...@@ -264,6 +267,7 @@ sub confirm_login {
SqlQuote($enteredlogin)); SqlQuote($enteredlogin));
$realpwd = FetchOneColumn(); $realpwd = FetchOneColumn();
} }
my $urlbase = Param("urlbase");
my $template = "From: bugzilla-daemon my $template = "From: bugzilla-daemon
To: %s To: %s
Subject: Your bugzilla password. Subject: Your bugzilla password.
...@@ -274,7 +278,7 @@ To use the wonders of bugzilla, you can use the following: ...@@ -274,7 +278,7 @@ To use the wonders of bugzilla, you can use the following:
Password: %s Password: %s
To change your password, go to: To change your password, go to:
[Param urlbase]changepassword.cgi ${urlbase}changepassword.cgi
(Your bugzilla and CVS password, if any, are not currently synchronized. (Your bugzilla and CVS password, if any, are not currently synchronized.
Top hackers are working around the clock to fix this, as you read this.) Top hackers are working around the clock to fix this, as you read this.)
...@@ -295,6 +299,7 @@ To use the wonders of bugzilla, you can use the following: ...@@ -295,6 +299,7 @@ To use the wonders of bugzilla, you can use the following:
exit; exit;
} }
my $enteredcryptpwd = crypt($enteredpwd, substr($realcryptpwd, 0, 2));
if ($realcryptpwd eq "" || $enteredcryptpwd ne $realcryptpwd) { if ($realcryptpwd eq "" || $enteredcryptpwd ne $realcryptpwd) {
print "Content-type: text/html\n\n"; print "Content-type: text/html\n\n";
print "<H1>Login failed.</H1>\n"; print "<H1>Login failed.</H1>\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment