From 242b57c08d2e8b093198dac99009ec01837576d8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 30 Jun 2005 07:36:57 +0000
Subject: sanitize network::activefw

---
 perl-install/network/activefw.pm   |  2 +-
 perl-install/standalone/drakids    | 10 +++++-----
 perl-install/standalone/net_applet | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/perl-install/network/activefw.pm b/perl-install/network/activefw.pm
index 3b80093ce..f8a9d1d6a 100644
--- a/perl-install/network/activefw.pm
+++ b/perl-install/network/activefw.pm
@@ -1,4 +1,4 @@
-package activefw;
+package network::activefw;
 
 use Net::DBus;
 use Net::DBus::Binding::Watch;
diff --git a/perl-install/standalone/drakids b/perl-install/standalone/drakids
index e76311cfd..2d68321e9 100644
--- a/perl-install/standalone/drakids
+++ b/perl-install/standalone/drakids
@@ -39,7 +39,7 @@ $whitelist->set_headers_clickable(1);
 $whitelist->get_column(0)->signal_connect('clicked', \&sort_by_column, $whitelist->get_model);
 $whitelist->get_column(0)->set_sort_column_id(0);
 
-my $activefw = activefw->new(sub {
+my $activefw = network::activefw->new(sub {
     my ($con, $msg) = @_;
     handle_blacklist($msg->get_args_list) if
       $msg->get_interface eq "com.mandrakesoft.activefirewall" &&
@@ -127,13 +127,13 @@ sub handle_blacklist {
     push @{$blacklist->{data}}, [
         $addr,
         $timestamp,
-        activefw::format_date($timestamp),
-        activefw::resolve_address(activefw::get_ip_address($addr)),
+        network::activefw::format_date($timestamp),
+        network::activefw::resolve_address(network::activefw::get_ip_address($addr)),
         $prefix eq 'SCAN' ? N("Port scanning") :
         $prefix eq 'SERV' ? N("Service attack") :
         $prefix eq 'PASS' ? N("Password cracking") :
         '',
-        activefw::get_service($port) || '',
+        network::activefw::get_service($port) || '',
         $indev,
         $protocol || '',
     ];
@@ -160,7 +160,7 @@ sub clear_whitelist {
 
 sub handle_whitelist {
     my ($addr) = @_;
-    push @{$whitelist->{data}}, [ $addr, activefw::resolve_address(activefw::get_ip_address($addr)) ];
+    push @{$whitelist->{data}}, [ $addr, network::activefw::resolve_address(network::activefw::get_ip_address($addr)) ];
 }
 
 sub get_selected_whitelist {
diff --git a/perl-install/standalone/net_applet b/perl-install/standalone/net_applet
index 1311da3fe..d8e72394e 100644
--- a/perl-install/standalone/net_applet
+++ b/perl-install/standalone/net_applet
@@ -109,7 +109,7 @@ my $interactive_cb;
 my @attacks_queue;
 
 if ($enable_activefw) {
-    $activefw = activefw->new(sub {
+    $activefw = network::activefw->new(sub {
         my ($_con, $msg) = @_;
         handle_attack($msg->get_args_list) if
           $msg->get_interface eq "com.mandrakesoft.activefirewall" &&
@@ -263,9 +263,9 @@ sub ask_attack_verdict {
         return;
     }
 
-    my $ip_addr = activefw::get_ip_address($addr);
-    my $hostname = activefw::resolve_address($ip_addr);
-    my $service = activefw::get_service($port);
+    my $ip_addr = network::activefw::get_ip_address($addr);
+    my $hostname = network::activefw::resolve_address($ip_addr);
+    my $service = network::activefw::get_service($port);
 
     my $msg = $prefix eq "SCAN" ? N("A port scanning attack has been attempted by %s.", $hostname)
             : $prefix eq "SERV" ? N("The %s service has been attacked by %s.", $service , $hostname)
@@ -309,7 +309,7 @@ sub ask_attack_verdict {
                       gtknew('HBox', children => [
                           0, gtknew('Label', text => "     "),
                           1, gtknew('VBox', children_loose => [
-                              N("Attack time: %s", activefw::format_date($timestamp)),
+                              N("Attack time: %s", network::activefw::format_date($timestamp)),
                               N("Network interface: %s", $indev),
                               N("Attack type: %s", $prefix),
                               if_($protocol, N("Protocol: %s", $protocol)),
-- 
cgit v1.2.1