Bug 340104: Move Bugzilla::Auth::get_netaddr() in Util.pm - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=justdave

2 files changed, 2 insertions, 5 deletions

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