Merge branch 'iptables-upnpfw' into core67-merge

[people/teissler/ipfire-2.x.git] / src / initscripts / init.d / firewall

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index c90687ca4b8e08864f7923116ba39da2c95aafbc..cc6b6190eb8ecb7c376934b1aa74968915c46c6c 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -188,7 +188,6 @@ case "$1" in
 
        # Outgoing Firewall
        /sbin/iptables -A FORWARD -j OUTGOINGFWMAC
-       /sbin/iptables -A FORWARD -j OUTGOINGFW
 
        # localhost and ethernet.
        /sbin/iptables -A INPUT   -i lo -m state --state NEW -j ACCEPT
@@ -253,6 +252,7 @@ case "$1" in
        # upnp chain for our upnp daemon
        /sbin/iptables -t nat -N UPNPFW
        /sbin/iptables -t nat -A PREROUTING -j UPNPFW
+       /sbin/iptables -A FORWARD -m state --state NEW -j UPNPFW
        # This chain only contains dummy rules.
        /sbin/iptables -N UPNPFW
 
@@ -336,7 +336,9 @@ case "$1" in
        ;;
   restart)
        $0 stop
+       $0 stopovpn
        $0 start
+       $0 startovpn
        ;;
   *)
         echo "Usage: $0 {start|stop|reload|restart}"