From 53af71374fb9777695de89caf11494582949de9f Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 6 Feb 2007 21:29:30 +0000
Subject: [PATCH] Add missing modules

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5368 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    |  2 ++
 Shorewall/compiler         |  3 +--
 Shorewall/modules          | 17 +++++++++++++----
 Shorewall/releasenotes.txt |  4 +++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 6799ecd8f..79ebc5f5a 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -15,6 +15,8 @@ Changes in 3.4.0 RC 1
 
 5)  Fix INCLUDE in extension scripts and /etc/shorewall/params.
 
+6)  Add helpers for SIP to the modules file.
+
 Changes in 3.4.0 Beta 3
 
 1)  Handle VLAN interface names like vlanX@ethY.
diff --git a/Shorewall/compiler b/Shorewall/compiler
index 047f439ef..157c2bc92 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -121,7 +121,6 @@ indent1() {
     fi
 }
 
-
 #
 # Append a file to the compiler's output with indentation.
 #
@@ -2955,7 +2954,7 @@ process_tos_rule() {
 	    fi
 
 	    [ -z "$dst" ] && eval dst=\$${dstzone}_hosts
-	;;
+	    ;;
     esac
 
     for dest in $dst; do
diff --git a/Shorewall/modules b/Shorewall/modules
index 0e2c2e3d3..962ea8393 100644
--- a/Shorewall/modules
+++ b/Shorewall/modules
@@ -3,7 +3,7 @@
 #
 # /usr/share/shorewall/modules
 #
-#	This file loads the modules needed by the firewall.
+#	This file loads the modules that may be needed by the firewall.
 #
 #	THE ORDER OF THE COMMANDS BELOW IS IMPORTANT!!!!!! You MUST load in
 #	dependency order. i.e., if M2 depends on M1 then you must load M1
@@ -46,13 +46,22 @@ loadmodule xt_tcpmss
 #
 # Helpers
 #
+loadmodule ip_conntrack_amanda
 loadmodule ip_conntrack_ftp
-loadmodule ip_conntrack_tftp
+loadmodule ip_conntrack_h323
 loadmodule ip_conntrack_irc
-loadmodule iptable_nat
+loadmodule ip_conntrack_netbios_ns
+loadmodule ip_conntrack_pptp
+loadmodule ip_conntrack_sip
+loadmodule ip_conntrack_tftp
+loadmodule ip_nat_amanda
 loadmodule ip_nat_ftp
-loadmodule ip_nat_tftp
+loadmodule ip_nat_h323
 loadmodule ip_nat_irc
+loadmodule ip_nat_pptp
+loadmodule ip_nat_sip
+loadmodule ip_nat_snmp_basic
+loadmodule ip_nat_tftp
 loadmodule ip_set
 loadmodule ip_set_iphash
 loadmodule ip_set_ipmap
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index c059b23ad..a02ae5dea 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -30,7 +30,9 @@ Release Highlights
 
 Problems Corrected in 3.4.0 RC2
 
-None.
+1)  The new SIP and H323 Netfilter helper modules were not being
+    automatically loaded by Shorewall. They have now been added to the
+    /usr/share/shorewall[-lite]/modules files.
 
 Other Changes in 3.4.0 RC 1