Bug 258515: Errors when accessing Bugzilla over IPv6 - Patch by Marc Schumann <wurblzap@gmail.com> r=joel, a=justdave

1 files changed, 3 insertions, 5 deletions

diff --git a/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm b/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
index a8ba4f777..c2244d15d 100644
--- a/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
+++ b/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
@@ -57,18 +57,16 @@ sub authenticate {
                 "  logincookies.userid=profiles.userid AND " .
                 "  logincookies.userid=? AND " .
                 "  (logincookies.ipaddr=?";
+    my @params = ($login_cookie, $login, $ipaddr);
     if (defined $netaddr) {
         trick_taint($netaddr);
         $query .= " OR logincookies.ipaddr=?";
+        push(@params, $netaddr);
     }
     $query .= ")";
 
     my $dbh = Bugzilla->dbh;
-    my ($userid, $disabledtext) = $dbh->selectrow_array($query, undef,
-                                                        $login_cookie,
-                                                        $login,
-                                                        $ipaddr,
-                                                        $netaddr);
+    my ($userid, $disabledtext) = $dbh->selectrow_array($query, undef, @params);
 
     return (AUTH_DISABLED, $userid, $disabledtext)
       if ($disabledtext);