michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove use of firewall_script, as it doesn't work the way I thought it would

Browse Source
This commit is contained in:
Jamie Cameron
2010-08-31 21:13:04 -07:00
parent bc5a353897
commit ef5df952a4
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ipfw/ipfw-lib.pl
View File

@@ -24,9 +24,6 @@ elsif ($has_net_lib) {
if ($rc{'firewall_type'} =~ /^\//) {
$ipfw_file = $rc{'firewall_type'};
}
elsif ($rc{'firewall_script'} =~ /^\//) {
$ipfw_file = $rc{'firewall_script'};
}
}
@actions = ( "allow", "deny", "reject", "reset", "skipto", "fwd", "check-state",
@@ -628,11 +625,10 @@ if ($has_net_lib && defined(&net::get_rc_conf)) {
# Disabled
return 0;
}
elsif ($rc{'firewall_type'} eq $ipfw_file ||
$rc{'firewall_script'} eq $ipfw_file) {
elsif ($rc{'firewall_type'} eq $ipfw_file) {
return 2;
}
elsif ($rc{'firewall_type'} || $rc{'firewall_script'}) {
elsif ($rc{'firewall_type'}) {
# A *different* file is enabled
return -1;
}
@@ -649,12 +645,7 @@ if ($has_net_lib && defined(&net::get_rc_conf) && &get_ipfw_format() == 1) {
# Add to rc.conf
local %rc = &net::get_rc_conf();
&lock_file("/etc/rc.conf");
if ($rc{'firewall_script'}) {
&net::save_rc_conf('firewall_script', $ipfw_file);
}
else {
&net::save_rc_conf('firewall_type', $ipfw_file);
}
&net::save_rc_conf('firewall_type', $ipfw_file);
&net::save_rc_conf('firewall_enable', 'YES');
&net::save_rc_conf('firewall_quiet', 'YES');
&unlock_file("/etc/rc.conf");