From b9944718bf2364eeaf4cada049e7a3b9cf0d37f0 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 28 Aug 2006 17:59:50 +0000
Subject: [PATCH] Clean up option initialization

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

diff --git a/Shorewall/functions b/Shorewall/functions
index ed1eb5a08..bacd121a2 100644
--- a/Shorewall/functions
+++ b/Shorewall/functions
@@ -2856,8 +2856,6 @@ do_initialize() {
     ALLOWRELATED=Yes
     LOGRATE=
     LOGBURST=
-    LOGPARMS=
-    LOGLIMIT=
     ADD_IP_ALIASES=
     ADD_SNAT_ALIASES=
     TC_ENABLED=
@@ -2901,7 +2899,15 @@ do_initialize() {
     IMPLICIT_CONTINUE=
     HIGH_ROUTE_MARKS=
     TC_EXPERT=
+    MODULESDIR=
+    IPSECFILE=
+    IP_FORWARDING=
+    CLEAR_TC=
+    MACLIST_TABLE=
+    FASTACCEPT=
 
+    LOGLIMIT=
+    LOGPARMS=
     OUTPUT=
     TMP_DIR=
     ALL_INTERFACES=
@@ -2909,7 +2915,6 @@ do_initialize() {
     IPSECMARK=256
     PROVIDERS=
     CRITICALHOSTS=
-    IPSECFILE=
     EXCLUSION_SEQ=1
     STOPPING=
     HAVE_MUTEX=
@@ -3082,6 +3087,7 @@ do_initialize() {
     else
 	LOGFORMAT="Shorewall:%s:%s:"
     fi
+
     ADMINISABSENTMINDED=$(added_param_value_no ADMINISABSENTMINDED $ADMINISABSENTMINDED)
     BLACKLISTNEWONLY=$(added_param_value_no BLACKLISTNEWONLY $BLACKLISTNEWONLY)
     DISABLE_IPV6=$(added_param_value_no DISABLE_IPV6 $DISABLE_IPV6)