Restore 5-character zone name capability

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@572 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-05-27 17:49:13 +00:00
parent ba432e10b0
commit 59660f2576

View File

@ -4482,10 +4482,16 @@ do_initialize() {
fi
if [ -n "$LOGFORMAT" ]; then
if ! qt printf "$LOGFORMAT" foo 1 bar ; then
startup_error "Invalid LOGFORMAT string: \"$LOGFORMAT\""
if [ -n "`echo $LOGFORMAT | grep '%d'`" ]; then
LOGRULENUMBERS=Yes
if ! qt printf "$LOGFORMAT" foo 1 bar ; then
startup_error "Invalid LOGFORMAT string: \"$LOGFORMAT\""
fi
else
if ! qt printf "$LOGFORMAT" foo bar ; then
startup_error "Invalid LOGFORMAT string: \"$LOGFORMAT\""
fi
fi
[ -n "`echo $LOGFORMAT | grep '%d'`" ] && LOGRULENUMBERS=Yes
else
LOGFORMAT="Shorewall:%s:%s:"
fi