[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bb28d8913a53b0c854d88bff34b4b63c7383da58

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3437 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  bb28d8913a53b0c854d88bff34b4b63c7383da58 (commit)
       via  23bb6839024fd112c4a394c6f72e7707a110226c (commit)
      from  9fcba2b5df715041e4a9057e749de2faee46e508 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bb28d8913a53b0c854d88bff34b4b63c7383da58
Merge: 23bb683 9fcba2b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Apr 20 17:45:49 2016 +0200

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

commit 23bb6839024fd112c4a394c6f72e7707a110226c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Apr 20 10:19:46 2016 +0200

    firewall: fix nat module load for application layer gateways
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/init.d/firewall | 7 +++++++
 1 file changed, 7 insertions(+)

Difference in files:
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 1d6309c..7bdb292 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -98,6 +98,7 @@ iptables_init() {
 
 	# SIP
 	if [ "${CONNTRACK_SIP}" = "on" ]; then
+		modprobe nf_nat_sip
 		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
 			-m helper --helper sip -j ACCEPT
 		for proto in udp tcp; do
@@ -107,6 +108,7 @@ iptables_init() {
 
 	# H.323
 	if [ "${CONNTRACK_H323}" = "on" ]; then
+		modprobe nf_nat_h323
 		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
 			-m helper --helper h323 -j ACCEPT
 
@@ -119,6 +121,7 @@ iptables_init() {
 
 	# FTP
 	if [ "${CONNTRACK_FTP}" = "on" ]; then
+		modprobe nf_nat_ftp
 		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
 			-m helper --helper ftp -p tcp --dport 1024: -j ACCEPT
 		iptables -t raw -A CONNTRACK -p tcp --dport 21 -j CT --helper ftp
@@ -126,6 +129,7 @@ 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 tcp --dport 1723 -j CT --helper pptp
@@ -133,6 +137,7 @@ iptables_init() {
 
 	# TFTP
 	if [ "${CONNTRACK_TFTP}" = "on" ]; then
+		modprobe nf_nat_tftp
 		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
 			-m helper --helper tftp -j ACCEPT
 		iptables -t raw -A CONNTRACK -p udp --dport 69 -j CT --helper tftp
@@ -140,6 +145,7 @@ iptables_init() {
 
 	# IRC
 	if [ "${CONNTRACK_IRC}" = "on" ]; then
+		modprobe nf_nat_irc
 		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
 			-m helper --helper irc -j ACCEPT
 		iptables -t raw -A CONNTRACK -p tcp --dport 6667 -j CT --helper irc
@@ -147,6 +153,7 @@ iptables_init() {
 
 	# Amanda
 	if [ "${CONNTRACK_AMANDA}" = "on" ]; then
+		modprobe nf_nat_amanda
 		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
 			-m helper --helper amanda -j ACCEPT
 		iptables -t raw -A CONNTRACK -p tcp -j CT --helper amanda


hooks/post-receive
--
IPFire 2.x development tree