firewall: Add amanda to the conntrack helpers

diff --git a/lfs/configroot b/lfs/configroot
index 26583a4eac39345a3201da2d176f5764021c10fa..ae9ceec4b46ec81eaedf5189be3315463206d904 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -136,7 +136,7 @@ $(TARGET) :
        echo  "POLICY1=MODE2"           >> $(CONFIG_ROOT)/firewall/settings
 
        # Add conntrack helper default settings
-       for proto in FTP PPTP SIP TFTP; do \
+       for proto in AMANDA FTP PPTP SIP TFTP; do \
                echo "CONNTRACK_$${proto}=on" >> $(CONFIG_ROOT)/optionsfw/settings; \
        done
 

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 4e6fd94f177f7b4062b9c8f3aa0b9b7841e6a902..0c74e02450074df3bf4c9c82f0b7c1a5fa9bc338 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -126,6 +126,13 @@ iptables_init() {
                iptables -t raw -A CONNTRACK -p udp --dport 69 -j CT --helper tftp
        fi
 
+       # Amanda
+       if [ "${CONNTRACK_AMANDA}" = "on" ]; then
+               iptables -A CONNTRACK -m conntrack --ctstate RELATED \
+                       -m helper --helper amanda -j ACCEPT
+               iptables -t raw -A CONNTRACK -j CT --helper amanda
+       fi
+
        # Fix for braindead ISP's
        iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu