From eec8a4edaf34c087aeaf986844aae514b06c0f64 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 7 Dec 2011 13:04:20 -0800 Subject: [PATCH] Cosmetic cleanup Signed-off-by: Tom Eastep --- Shorewall/lib.cli-std | 8 +++++++- Shorewall/shorewall | 12 ------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index 44a5402f4..98ff291ab 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -22,7 +22,13 @@ # # This library contains the command processing code common to /sbin/shorewall and /sbin/shorewall6. # - +#################################################################################################### +# Set the configuration variables from the .conf file +# +# $1 = Yes: read the params file +# $2 = Yes: check for STARTUP_ENABLED +# $3 = Yes: Check for LOGFILE +# get_config() { local prog diff --git a/Shorewall/shorewall b/Shorewall/shorewall index f53f75b3a..c2d210efd 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -7,8 +7,6 @@ # (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011 - # Tom Eastep (teastep@shorewall.net) # -# This file should be placed in /sbin/shorewall. -# # Shorewall documentation is available at http://www.shorewall.net # # This program is free software; you can redistribute it and/or modify @@ -27,17 +25,7 @@ # For a list of supported commands, type 'shorewall help' or 'shorewall6 help' # ################################################################################################ -# -# Set the configuration variables from the .conf file -# -# $1 = Yes: read the params file -# $2 = Yes: check for STARTUP_ENABLED -# $3 = Yes: Check for LOGFILE -# -# -# Execution begins here -# g_debugging= if [ $# -gt 0 ] && [ "x$1" = "xdebug" -o "x$1" = "xtrace" ]; then