Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code

Shorewall-core/lib.common

@@ -79,6 +79,15 @@ fatal_error() # $@ = Message
     exit 2
 }
 
+#
+# Not configured Error
+#
+not_configured() # $@ = Message
+{
+    echo "   ERROR: $@" >&2
+    exit 6
+}
+
 #
 # Get the Shorewall version of the passed script
 #

Shorewall-init/shorewall-init

@@ -1,18 +1,19 @@
-#! /bin/bash
+#!/bin/bash
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
+#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.6
 #
 #	(c) 2012-2014 - Tom Eastep (teastep@shorewall.net)
 #
-#       On most distributions, this file should be called /etc/init.d/shorewall.
+#	On most distributions, this file should be called
+#	/etc/init.d/shorewall.
 #
 #	Complete documentation is available at http://shorewall.net
 #
 #	This program is part of Shorewall.
 #
 #	This program is free software; you can redistribute it and/or modify
-#	it under the terms of the GNU General Public License as published by the
+#	it under the terms of the GNU General Public License as published by
-#       Free Software Foundation, either version 2 of the license or, at your
+#	the Free Software Foundation, either version 2 of the license or,
-#       option, any later version.
+#	at your option, any later version.
 #
 #	This program is distributed in the hope that it will be useful,
 #	but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,7 +23,7 @@
 #	You should have received a copy of the GNU General Public License
 #	along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
-#########################################################################################
+###############################################################################
 # set the STATEDIR variable
 setstatedir() {
     local statedir
@@ -33,7 +34,9 @@ setstatedir() {
     [ -n "$statedir" ] && STATEDIR=${statedir} || STATEDIR=${VARLIB}/${PRODUCT}
 
     if [ $PRODUCT = shorewall -o $PRODUCT = shorewall6 ]; then
-	${SBINDIR}/$PRODUCT ${OPTIONS} compile -c || exit 1
+	${SBINDIR}/$PRODUCT ${OPTIONS} compile -c
+    else
+	return 0
     fi
 }
 
@@ -61,22 +64,17 @@ shorewall_start () {
 
     echo -n "Initializing \"Shorewall-based firewalls\": "
     for PRODUCT in $PRODUCTS; do
-      setstatedir
+	if setstatedir; then
-
 	    if [ -x ${STATEDIR}/firewall ]; then
 		#
 		# Run in a sub-shell to avoid name collisions
 		#
 		(
 		    if ! ${STATEDIR}/firewall status > /dev/null 2>&1; then
-		  ${STATEDIR}/firewall ${OPTIONS} stop || exit 1
+			${STATEDIR}/firewall ${OPTIONS} stop
-	      else
-		  exit 1
 		    fi
 		)
-      else
+	    fi
-          echo ERROR:  ${STATEDIR}/firewall does not exist or is not executable!
-	  exit 1
 	fi
     done
 
@@ -94,10 +92,10 @@ shorewall_stop () {
 
     echo -n "Clearing \"Shorewall-based firewalls\": "
     for PRODUCT in $PRODUCTS; do
-      setstatedir
+	if setstatedir; then
-
 	    if [ -x ${STATEDIR}/firewall ]; then
-	  ${STATEDIR}/firewall ${OPTIONS} clear || exit 1
+		${STATEDIR}/firewall ${OPTIONS} clear
+	    fi
 	fi
     done
 

Shorewall/lib.cli-std

@@ -162,14 +162,13 @@ get_config() {
 	if [ "$2" = Yes ]; then
 	    case $STARTUP_ENABLED in
 		No|no|NO)
-		    fatal_error "$g_product startup is disabled. To enable startup, set STARTUP_ENABLED=Yes in ${g_confdir}/${g_program}.conf"
+		    not_configured "$g_product startup is disabled. To enable startup, set STARTUP_ENABLED=Yes in ${g_confdir}/${g_program}.conf"
 		    ;;
 		Yes|yes|YES)
 		    ;;
 		*)
 		    if [ -n "$STARTUP_ENABLED" ]; then
-			fatal_error "Invalid Value for STARTUP_ENABLED: $STARTUP_ENABLED"
+			not_configured "Invalid Value for STARTUP_ENABLED: $STARTUP_ENABLED"
-			exit 6
 		    fi
 		    ;;
 	    esac
@@ -510,7 +509,7 @@ start_command() {
 	exit 0
     fi
 
-    [ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
+    [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled"
 
     while [ $finished -eq 0 -a $# -gt 0 ]; do
 	option=$1
@@ -1002,7 +1001,7 @@ restart_command() {
 	    ;;
     esac
 
-    [ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
+    [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled"
 
     if [ -z "$g_fast" -a -n "$AUTOMAKE" ]; then
 	uptodate ${VARDIR}/firewall && g_fast=Yes
@@ -1101,7 +1100,7 @@ refresh_command() {
 
     product_is_started || fatal_error "$g_product is not running"
 
-    [ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
+    [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled"
 
     if compiler $g_debugging $nolock compile ${VARDIR}/.refresh; then
 	run_postcompile ${VARDIR}/.refresh
@@ -1190,7 +1189,7 @@ safe_commands() {
 	    ;;
     esac
 
-    [ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
+    [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled"
 
     if product_is_started; then
 	running=Yes
@@ -1327,7 +1326,7 @@ try_command() {
 	    ;;
     esac
 
-    [ -n "$STARTUP_ENABLED" ] || fatal_error "Startup is disabled"
+    [ -n "$STARTUP_ENABLED" ] || not_configured "Startup is disabled"
 
     if product_is_started; then
 	running=Yes