From: lpsolit%gmail.com <>
Date: Wed, 23 Mar 2005 06:46:25 +0000 (+0000)
Subject: Bug 258515: Errors when accessing Bugzilla over IPv6 - Patch by Marc Schumann <wurblz... 
X-Git-Tag: bugzilla-2.18.1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e84abb49d5d6b7795036618118566ddf162a5a57;p=thirdparty%2Fbugzilla.git

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

diff --git a/Bugzilla/Auth/Cookie.pm b/Bugzilla/Auth/Cookie.pm
index b50acbe242..721209d12a 100644
--- a/Bugzilla/Auth/Cookie.pm
+++ b/Bugzilla/Auth/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);