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

diff --cc src/initscripts/init.d/firewall
index be69fbe6adde0056d45cbc311bac48320e6c0854,1d6309c1b0d50a8b26013362669a1e6e797a0c40..7bdb292f7ddb8a2160377a45180fe58de40b93dc
--- 1/src/initscripts/init.d/firewall
--- 2/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