Firewall: renamed forwardfwctrl to firewallctrl

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]");}

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;

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");}

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

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
 }

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

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"

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 $@