From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 20 Apr 2016 15:45:49 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core101~4
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=bb28d8913a53b0c854d88bff34b4b63c7383da58

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

bb28d8913a53b0c854d88bff34b4b63c7383da58
diff --cc src/initscripts/init.d/firewall
index be69fbe6ad,1d6309c1b0..7bdb292f7d
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@@ -129,10 -126,9 +129,10 @@@ iptables_init() 
  
  	# PPTP
  	if [ "${CONNTRACK_PPTP}" = "on" ]; then
 +		modprobe nf_nat_pptp
  		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
  			-m helper --helper pptp -j ACCEPT
- 		iptables -t raw -A CONNTRACK -p udp --dport 1723 -j CT --helper pptp
+ 		iptables -t raw -A CONNTRACK -p tcp --dport 1723 -j CT --helper pptp
  	fi
  
  	# TFTP