From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 3 Mar 2013 12:57:39 +0000 (+0100)
Subject: Merge branch 'iptables-upnpfw' into core67-merge
X-Git-Tag: v2.13-core67~10^2~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=31901da1edb401590960558b61e31ddd9fda89c1;hp=-c

Merge branch 'iptables-upnpfw' into core67-merge
---

31901da1edb401590960558b61e31ddd9fda89c1
diff --combined src/initscripts/init.d/firewall
index e54ecedc6b,38e67e0856..cc6b6190eb
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@@ -252,6 -252,7 +252,7 @@@ case "$1" i
  	# 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
  
@@@ -335,9 -336,7 +336,9 @@@
  	;;
    restart)
  	$0 stop
 +	$0 stopovpn
  	$0 start
 +	$0 startovpn
  	;;
    *)
          echo "Usage: $0 {start|stop|reload|restart}"