mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-09 01:04:06 +01:00
Use error_message() within the library
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3906 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
158ad0ea49
commit
96b9cb5690
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user