diff --git a/Shorewall/compiler b/Shorewall/compiler index 676e8f67e..d4c493952 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -2609,7 +2609,6 @@ ip -f inet addr show $interface 2> /dev/null | grep 'inet.*brd' | sed 's/inet // done __EOF__ - fi if [ -n "$MACLIST_LOG_LEVEL" ]; then diff --git a/Shorewall/functions b/Shorewall/functions index 21e2a7372..3c52e3620 100644 --- a/Shorewall/functions +++ b/Shorewall/functions @@ -517,7 +517,7 @@ mktempfile() { > $1/shorewall-$$ && echo $1/shorewall-$$ ;; *) - echo " ERROR:Internal error in mktempfile" >&2 + error_message "ERROR:Internal error in mktempfile" ;; esac else @@ -533,7 +533,7 @@ mktempfile() { > /tmp/shorewall-$$ && echo /tmp/shorewall-$$ ;; *) - echo " ERROR:Internal error in mktempfile" >&2 + error_message "ERROR:Internal error in mktempfile" ;; esac fi @@ -558,7 +558,7 @@ mktempdir() { mkdir -p /tmp/shorewall-$$ chmod 700 /tmp/shorewall-$$ && echo /tmp/shorewall-$$ ;; *) - echo " ERROR:Internal error in mktempdir" >&2 + error_message "ERROR:Internal error in mktempdir" ;; esac } @@ -577,7 +577,7 @@ read_file() # $1 = file name, $2 = nest count if [ $2 -lt 4 ]; then read_file $(find_file $(expand ${rest%#*})) $(($2 + 1)) else - echo " WARNING: INCLUDE in $1 ignored (nested too deeply)" >&2 + error_message "WARNING: INCLUDE in $1 ignored (nested too deeply)" fi else echo "$first $rest"