summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Grad <florin@mandriva.com>2002-09-17 17:02:28 +0000
committerFlorin Grad <florin@mandriva.com>2002-09-17 17:02:28 +0000
commitb63f653cb4edca6d69c0aef98e8416ba41741127 (patch)
tree871422dad0f8a70514bea62925800ca208e1e293
parente1c74c6f0cf1efe50a6777ae55a9b4b29be4afd7 (diff)
downloaddrakx-b63f653cb4edca6d69c0aef98e8416ba41741127.tar
drakx-b63f653cb4edca6d69c0aef98e8416ba41741127.tar.gz
drakx-b63f653cb4edca6d69c0aef98e8416ba41741127.tar.bz2
drakx-b63f653cb4edca6d69c0aef98e8416ba41741127.tar.xz
drakx-b63f653cb4edca6d69c0aef98e8416ba41741127.zip
small updates
-rw-r--r--perl-install/network/shorewall.pm21
1 files changed, 12 insertions, 9 deletions
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index b48275ab3..a876ff379 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -1,7 +1,7 @@
package network::shorewall; # $Id$
-use diagnostics;
-use strict;
+
+
use detect_devices;
use network::netconnect;
@@ -72,18 +72,21 @@ sub read {
if (my ($e) = get_config_file('masq')) {
$conf{masquerade}{subnet} = $e->[1] if $e->[1];
}
+ require Data::Dumper;
+ print "before\n";
+ print Data::Dumper->Dump([\%conf], ['%conf']);
+ put_in_hash(\%conf, default_interfaces());
+ print "after\n";
+ print Data::Dumper->Dump([\%conf], ['%conf']);
foreach (get_config_file('interfaces')) {
my ($name, $interface) = @$_;
- if ($name eq 'net') {
- $conf{net_interface} = $interface;
- } elsif ($name eq 'masq') {
+ if ($name eq 'masq') {
$conf{masquerade}{interface} = $interface;
- } elsif ($name eq 'loc') {
- push @{$conf{loc_interface}}, $interface;
- } else {
- log::l("unknown interface name $name");
+ $conf{loc_interface} = [ difference2($conf{loc_interface}, [$interface]) ];
}
}
+ print "after masq\n";
+ print Data::Dumper->Dump([\%conf], ['%conf']);
$conf{net_interface} && \%conf;
}