From 1a18e5fc2c3678e9a4a3049b9289e417ce174c7e Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Sat, 3 Jun 2006 19:23:12 +0000
Subject: Bug 340104: Move Bugzilla::Auth::get_netaddr() in Util.pm - Patch by
 Frédéric Buclin <LpSolit@gmail.com> r/a=justdave
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Auth/Login/Cookie.pm   | 3 +--
 Bugzilla/Auth/Persist/Cookie.pm | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'Bugzilla/Auth')

diff --git a/Bugzilla/Auth/Login/Cookie.pm b/Bugzilla/Auth/Login/Cookie.pm
index 2ca4aca72..f2a93e94e 100644
--- a/Bugzilla/Auth/Login/Cookie.pm
+++ b/Bugzilla/Auth/Login/Cookie.pm
@@ -19,7 +19,6 @@ package Bugzilla::Auth::Login::Cookie;
 use strict;
 use base qw(Bugzilla::Auth::Login);
 
-use Bugzilla::Auth;
 use Bugzilla::Constants;
 use Bugzilla::Util;
 
@@ -35,7 +34,7 @@ sub get_login_info {
     my $dbh = Bugzilla->dbh;
 
     my $ip_addr      = $cgi->remote_addr();
-    my $net_addr     = Bugzilla::Auth::get_netaddr($ip_addr);
+    my $net_addr     = get_netaddr($ip_addr);
     my $login_cookie = $cgi->cookie("Bugzilla_logincookie");
     my $user_id      = $cgi->cookie("Bugzilla_login");
 
diff --git a/Bugzilla/Auth/Persist/Cookie.pm b/Bugzilla/Auth/Persist/Cookie.pm
index c41948e72..7d1209a0e 100644
--- a/Bugzilla/Auth/Persist/Cookie.pm
+++ b/Bugzilla/Auth/Persist/Cookie.pm
@@ -32,7 +32,6 @@ package Bugzilla::Auth::Persist::Cookie;
 use strict;
 use fields qw();
 
-use Bugzilla::Auth;
 use Bugzilla::Config;
 use Bugzilla::Constants;
 use Bugzilla::Util;
@@ -55,8 +54,7 @@ sub persist_login {
     unless ($cgi->param('Bugzilla_restrictlogin') ||
             Param('loginnetmask') == 32) 
     {
-        # XXX I don't like this subclass being dependent upon its parent.
-        $ip_addr = Bugzilla::Auth::get_netaddr($ip_addr);
+        $ip_addr = get_netaddr($ip_addr);
     }
 
     # The IP address is valid, at least for comparing with itself in a
-- 
cgit v1.2.3-24-g4f1b