Firewall: renamed forwardfwctrl to firewallctrl

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index b9b7d2c823c23701db5a37fee28fa39b6f00a6d6..5424a1e123a8d443b3fcb135a30f25162ae44859 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -123,7 +123,7 @@ elsif ($ARGV[0] eq 'restore') {
        System("/usr/sbin/convert-portfw");
        rmtree("${General::swroot}/portfw");
   }
-  system("/usr/local/bin/forwardfwctrl");
+  system("/usr/local/bin/firewallctrl");
  }
 elsif ($ARGV[0] eq 'restoreaddon') {
   if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 5a7a8c957d684b36d0eac0be42b2524fd450ad46..48d68a2cd9acbb497f2a8f53cd298978e3bbc823 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1153,7 +1153,7 @@ sub firewall_needs_reload() {
 }
 
 sub firewall_reload() {
-       system("/usr/local/bin/forwardfwctrl");
+       system("/usr/local/bin/firewallctrl");
 }
 
 1;

diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw
index f832a2c549de61b2759611270de3bfe8330d82be..0d7f7d3dd6f12d4b2ef06756acd38bb72c56cde0 100755 (executable)
--- a/config/firewall/convert-outgoingfw
+++ b/config/firewall/convert-outgoingfw
@@ -71,7 +71,7 @@ if ( -d "/var/ipfire/outgoing"){
        &process_rules;
        &process_p2p;
 }
-system("/usr/local/bin/forwardfwctrl");
+system("/usr/local/bin/firewallctrl");
 sub process_groups
 {
        if(! -d "/var/log/converters"){ mkdir("/var/log/converters");}

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 2463ba2aa9e9622e3a837f4389d0372a4dc7dae8..1ab4dec5f1aa5053d5a8a96d798f08cf7c95e870 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -16,7 +16,7 @@ usr/local/bin/logwatch
 #usr/local/bin/mpfirectrl
 usr/local/bin/openvpnctrl
 #usr/local/bin/outgoingfwctrl
-usr/local/bin/forwardfwctrl
+usr/local/bin/firewallctrl
 usr/local/bin/pakfire
 usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 08cf04cba5f22213a34b40ec778d3fd71df69a7d..9563aabc8cfc835d1a1373e99633afe4cb97a749 100644 (file)
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -41,7 +41,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
        if ($settings{'defpol'} ne '1'){
                $errormessage .= $Lang::tr{'new optionsfw later'};
                &General::writehash($filename, \%settings);             # Save good settings
-               system("/usr/local/bin/forwardfwctrl");
+               system("/usr/local/bin/firewallctrl");
        }else{
                if ($settings{'POLICY'} ne ''){
                        $fwdfwsettings{'POLICY'} = $settings{'POLICY'};
@@ -56,7 +56,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
                $fwdfwsettings{'POLICY1'} = "$MODE1";
                &General::writehash("${General::swroot}/firewall/settings", \%fwdfwsettings);
                &General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
-               system("/usr/local/bin/forwardfwctrl");
+               system("/usr/local/bin/firewallctrl");
        }
        &General::readhash($filename, \%settings);             # Load good settings
 }

diff --git a/lfs/initscripts b/lfs/initscripts
index 0b2dbee775331935380de5bd25a19380722cb7a6..eae451b24ca912d1efe6490377942fcd67204a41 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -179,7 +179,7 @@ $(TARGET) :
 
        ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
        ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall
-       ln -sf ../../../../../usr/local/bin/forwardfwctrl \
+       ln -sf ../../../../../usr/local/bin/firewallctrl \
                /etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
        ln -sf ../../../../../usr/local/bin/snortctrl \
                /etc/rc.d/init.d/networking/red.up/23-RS-snort

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index fc49da4e9192711e295f68408f887ac837cf3294..36d7e449fcc9d94357614b085d83c7e86d93a5df 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -223,7 +223,7 @@ iptables_init() {
        /usr/sbin/firewall-policy
 
        # read new firewall
-       /usr/local/bin/forwardfwctrl
+       /usr/local/bin/firewallctrl
 
        if [ "$DROPINPUT" == "on" ]; then
                /sbin/iptables -A INPUT   -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT"

diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile
index c748a66b4704c82f55ddcef04664d867280dd135..b4474355ad53797c46608dda2cfd09a2d6aae549 100644 (file)
--- a/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@ -27,7 +27,7 @@ PROGS = iowrap
 SUID_PROGS = squidctrl sshctrl ipfirereboot \
        ipsecctrl timectrl dhcpctrl snortctrl \
        applejuicectrl rebuildhosts backupctrl \
-       logwatch openvpnctrl forwardfwctrl \
+       logwatch openvpnctrl firewallctrl \
        wirelessctrl getipstat qosctrl launch-ether-wake \
        redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \
        smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \
@@ -86,8 +86,8 @@ smartctrl: smartctrl.c setuid.o ../install+setup/libsmooth/varval.o
 clamavctrl: clamavctrl.c setuid.o ../install+setup/libsmooth/varval.o
        $(COMPILE) -I../install+setup/libsmooth/ clamavctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 
-forwardfwctrl: forwardfwctrl.c setuid.o ../install+setup/libsmooth/varval.o
-       $(COMPILE) -I../install+setup/libsmooth/ forwardfwctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
+firewallctrl: firewallctrl.c setuid.o ../install+setup/libsmooth/varval.o
+       $(COMPILE) -I../install+setup/libsmooth/ firewallctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 
 timectrl: timectrl.c setuid.o ../install+setup/libsmooth/varval.o
        $(COMPILE) -I../install+setup/libsmooth/ timectrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@

diff --git a/src/misc-progs/forwardfwctrl.c b/src/misc-progs/firewallctrl.c
similarity index 100%
rename from src/misc-progs/forwardfwctrl.c
rename to src/misc-progs/firewallctrl.c