outgoing firewall: Reload firewall.local when changing outgoing fw.

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 7dd14303a10c2d9d67c5dead71b56e6b28b488a8..1208567dd7ad015bc290e2e4debb8628ec708ab1 100644 (file)
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -105,6 +105,7 @@ system("/sbin/iptables --delete-chain OUTGOINGFWMAC >/dev/null 2>&1");
 system("/sbin/iptables -N OUTGOINGFWMAC >/dev/null 2>&1");
 
 if ( $outfwsettings{'POLICY'} eq 'MODE0' ) {
 system("/sbin/iptables -N OUTGOINGFWMAC >/dev/null 2>&1");
 
 if ( $outfwsettings{'POLICY'} eq 'MODE0' ) {

+       &firewall_local_reload();

        exit 0
 }
 
        exit 0
 }
 


@@ -264,6 +265,8 @@ if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
        applyrule("-o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '", 0);
 }
 
        applyrule("-o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '", 0);
 }
 

+&firewall_local_reload();
+

 sub applyrule($$) {
        my $cmd = shift;
        my $macrule = shift;
 sub applyrule($$) {
        my $cmd = shift;
        my $macrule = shift;


@@ -273,3 +276,11 @@ sub applyrule($$) {
                system("/sbin/iptables -A OUTGOINGFW $cmd");
        }
 }
                system("/sbin/iptables -A OUTGOINGFW $cmd");
        }
 }

+
+sub firewall_local_reload() {
+       my $script = "/etc/sysconfig/firewall.local";
+
+       if ( -x $script ) {
+               system("$script reload >/dev/null 2>&1");
+       }
+}

diff --git a/config/rootfiles/core/70/filelists/files b/config/rootfiles/core/70/filelists/files
index 683da926f42457bcf940a59055fac66d4af82bd8..52b9be75a42b412b419a1a7339fa7111bba2a42c 100644 (file)
--- a/config/rootfiles/core/70/filelists/files
+++ b/config/rootfiles/core/70/filelists/files
@@ -49,3 +49,4 @@ usr/lib/squid/errors/tr/ERR_ZERO_SIZE_OBJECT
 usr/lib/squid/errors/tr/error-details.txt
 usr/local/bin/setddns.pl
 var/ipfire/general-functions.pl
 usr/lib/squid/errors/tr/error-details.txt
 usr/local/bin/setddns.pl
 var/ipfire/general-functions.pl

+var/ipfire/outgoing/bin/outgoingfw.pl