holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Use error_message() within the library

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3906 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-05-12 14:34:15 +00:00
parent 158ad0ea49
commit 96b9cb5690
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall/compiler
View File

@ -2609,7 +2609,6 @@ ip -f inet addr show $interface 2> /dev/null | grep 'inet.*brd' | sed 's/inet //
done done
__EOF__ __EOF__
fi fi
if [ -n "$MACLIST_LOG_LEVEL" ]; then if [ -n "$MACLIST_LOG_LEVEL" ]; then

8
Shorewall/functions
View File

@ -517,7 +517,7 @@ mktempfile() {
> $1/shorewall-$$ && echo $1/shorewall-$$ > $1/shorewall-$$ && echo $1/shorewall-$$
;; ;;
*) *)
echo " ERROR:Internal error in mktempfile" >&2 error_message "ERROR:Internal error in mktempfile"
;; ;;
esac esac
else else
@ -533,7 +533,7 @@ mktempfile() {
> /tmp/shorewall-$$ && echo /tmp/shorewall-$$ > /tmp/shorewall-$$ && echo /tmp/shorewall-$$
;; ;;
*) *)
echo " ERROR:Internal error in mktempfile" >&2 error_message "ERROR:Internal error in mktempfile"
;; ;;
esac esac
fi fi
@ -558,7 +558,7 @@ mktempdir() {
mkdir -p /tmp/shorewall-$$ chmod 700 /tmp/shorewall-$$ && echo /tmp/shorewall-$$ 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 esac
} }
@ -577,7 +577,7 @@ read_file() # $1 = file name, $2 = nest count
if [ $2 -lt 4 ]; then if [ $2 -lt 4 ]; then
read_file $(find_file $(expand ${rest%#*})) $(($2 + 1)) read_file $(find_file $(expand ${rest%#*})) $(($2 + 1))
else else
echo " WARNING: INCLUDE in $1 ignored (nested too deeply)" >&2 error_message "WARNING: INCLUDE in $1 ignored (nested too deeply)"
fi fi
else else
echo "$first $rest" echo "$first $rest"