From 38ad4b8db31ca67a1a55cc83be26cd03d7c7468c Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 22 Aug 2006 22:11:14 +0000
Subject: [PATCH] Add clib.nat module -- Take 2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4402 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/compiler | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Shorewall/compiler b/Shorewall/compiler
index ab1de5f5c..8bbc3c3ef 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -4699,7 +4699,7 @@ initialize_netfilter () {
     deletechain shorewall
 
     if [ -n "$NAT_ENABLED" ]; then
-	delete_nat
+	[ -n "$CLIB_NAT_LOADED" ] && delete_nat
 	for chain in PREROUTING POSTROUTING OUTPUT; do
 	    qt_iptables -t nat -P $chain ACCEPT
 	done
@@ -6264,8 +6264,11 @@ __EOF__
 	[ -n "$ROUTEMARK_INTERFACES" ] &&               setup_routes
     fi
 
-    progress_message2 "$DOING NAT...";                  setup_nat
-    progress_message2 "$DOING NETMAP...";               setup_netmap
+    if [ -n "$CLIB_NAT_LOADED" ]; then
+	progress_message2 "$DOING NAT...";              setup_nat
+	progress_message2 "$DOING NETMAP...";           setup_netmap
+    fi
+
     progress_message2 "$DOING Common Rules";            add_common_rules
 
     save_progress_message "Setting up SYN Flood Protection..."
@@ -6344,9 +6347,10 @@ __EOF__
 	save_command add_ip_aliases $ALIASES_TO_ADD
     fi
 
-    files="zones nat"
+    files="zones"
 
     [ -n "$CLIB_PROXYARP_LOADED" ] && files="$files proxyarp"
+    [ -n "$CLIB_NAT_LOADED" ]      && files="$files nat"
 
     for file in chains $files; do
 	save_command "cat > \${VARDIR}/$file $LEFTSHIFT __EOF__"