Fix log-related commands

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6530 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-12 21:43:26 +00:00
parent 184aed020d
commit c9119960e8
2 changed files with 8 additions and 5 deletions

View File

@ -25,11 +25,14 @@ Problems corrected in 4.0.0 Beta 5.
at /usr/share/shorewall-perl/Shorewall/Chains.pm line 1521, <$currentfile> at /usr/share/shorewall-perl/Shorewall/Chains.pm line 1521, <$currentfile>
line 363. line 363.
2) 'shorewall[-lite] dump', 'shorewall[-lite] show log' and
'shorewall[-lite] logwatch' work again.
Other changes in Shorewall 4.0.0 Beta 5. Other changes in Shorewall 4.0.0 Beta 5.
1) The Perl compiler is now externalized. Currently only the 1) The Perl compiler is now externalized. Currently only the
compiler.pl program is documented but eventually, I plan to also compiler.pl program is documented but eventually, I plan to also
document the Perl Module interface. document the Perl Module interface. "
The compiler program is /usr/share/shorewall-perl/compiler.pl: The compiler program is /usr/share/shorewall-perl/compiler.pl:

View File

@ -152,7 +152,7 @@ get_config() {
# #
export CONFIG_PATH export CONFIG_PATH
if [ "$2" = Yes ]; then if [ "$3" = Yes ]; then
[ -z "$LOGFILE" ] && LOGFILE=/var/log/messages [ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
if [ -n "$(syslog_circular_buffer)" ]; then if [ -n "$(syslog_circular_buffer)" ]; then
@ -1506,7 +1506,7 @@ case "$COMMAND" in
exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $@ exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $@
;; ;;
show|list) show|list)
get_config Yes get_config Yes No Yes
shift shift
show_command $@ show_command $@
;; ;;
@ -1548,7 +1548,7 @@ case "$COMMAND" in
exit $status exit $status
;; ;;
dump) dump)
get_config Yes get_config Yes No Yes
shift shift
dump_command $@ dump_command $@
;; ;;
@ -1575,7 +1575,7 @@ case "$COMMAND" in
try_command $@ try_command $@
;; ;;
logwatch) logwatch)
get_config Yes get_config Yes Yes Yes
banner="Shorewall-$version Logwatch at $HOSTNAME -" banner="Shorewall-$version Logwatch at $HOSTNAME -"
logwatch_command $@ logwatch_command $@
;; ;;