summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-06-07 07:15:14 +0000
committerOlivier Blin <oblin@mandriva.org>2005-06-07 07:15:14 +0000
commit191df3977046a9ae332bc302ce6080824110c852 (patch)
tree22d6abf68625e2ca982aa86306d3c4f119dd9019 /perl-install/network
parent5a17de566fd2b45e08a61843eb7baa6a6e5c8015 (diff)
downloaddrakx-191df3977046a9ae332bc302ce6080824110c852.tar
drakx-191df3977046a9ae332bc302ce6080824110c852.tar.gz
drakx-191df3977046a9ae332bc302ce6080824110c852.tar.bz2
drakx-191df3977046a9ae332bc302ce6080824110c852.tar.xz
drakx-191df3977046a9ae332bc302ce6080824110c852.zip
don't be fooled by if_ not short-circuiting and auto-vivification, use $conf->{masq_subnet} instead of $conf->{masquerade}{subnet} (i.e. do not write buggy shorewall masqfile when connection sharing is disabled)
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/shorewall.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index d42772b94..2d6ec55d2 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -101,7 +101,7 @@ sub read {
$conf{redirects}{$_->[3]}{$_->[2]} = $_->[4] foreach grep { $_->[0] eq 'REDIRECT' } @rules;
if (my ($e) = get_config_file('masq')) {
- $conf{masquerade}{subnet} = $e->[1] if $e->[1];
+ $conf{masq_subnet} = $e->[1];
}
read_default_interfaces(\%conf, $o_in);
$conf{net_interface} && \%conf;
@@ -142,7 +142,7 @@ sub write {
map_each { [ 'REDIRECT', 'loc', $::a, $_, $::b, '-' ] } %{$conf->{redirects}{$_}};
} keys %{$conf->{redirects}}),
);
- set_config_file('masq', if_($conf->{masquerade}, [ $conf->{net_interface}, $conf->{masquerade}{subnet} ]));
+ set_config_file('masq', if_($conf->{masq_subnet}, [ $conf->{net_interface}, $conf->{masq_subnet} ]));
services::set_status('shorewall', !$conf->{disabled}, $::isInstall);
}