Add log file name to the output of 'shorewall show log' and 'shorewall logwatch'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4528 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-09-06 17:12:00 +00:00
parent 52e4d0af41
commit 525bfe5baa
6 changed files with 26 additions and 11 deletions

View File

@ -1,3 +1,8 @@
Changes in 3.3.2
1) Add logfile name to output of "shorewall show log" and "shorewall
logwatch".
Changes in 3.3.1 Changes in 3.3.1
1) Update Versions. 1) Update Versions.

View File

@ -1,11 +1,14 @@
Shorewall Lite 3.3.1 Shorewall Lite 3.3.2
Problems Corrected in 3.3.0 Problems Corrected in 3.3.2
None. None.
Other changes in 3.3.0 Other changes in 3.3.2
1) The output of "shorewall show log" and "shorewall logwatch" now
include the name of the log file being accessed.
None.

View File

@ -349,7 +349,7 @@ logwatch() # $1 = timeout -- if negative, prompt each time that
echo "$banner $(date)" echo "$banner $(date)"
echo echo
echo "Dropped/Rejected Packet Log" echo "Dropped/Rejected Packet Log ($LOGFILE)"
echo echo
show_reset show_reset
@ -734,7 +734,7 @@ show_command() {
;; ;;
log) log)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && usage 1
echo "Shorewall Lite $version Log at $HOSTNAME - $(date)" echo "Shorewall Lite $version Log ($LOGFILE) at $HOSTNAME - $(date)"
echo echo
show_reset show_reset
host=$(echo $HOSTNAME | sed 's/\..*$//') host=$(echo $HOSTNAME | sed 's/\..*$//')

View File

@ -4,5 +4,9 @@ Changes in 3.3.1
2) Implement default action/macros at the individual policy level. 2) Implement default action/macros at the individual policy level.
3) Add logfile name to output of "shorewall show log" and "shorewall
logwatch".

View File

@ -49,6 +49,9 @@ Other changes in 3.3.2
/etc/shorewall/lib.base. If you soure the 'functions' file in any /etc/shorewall/lib.base. If you soure the 'functions' file in any
of your own scripts, please modify them accordingly. of your own scripts, please modify them accordingly.
2) The output of "shorewall show log" and "shorewall logwatch" now
include the name of the log file being accessed.
Migration Considerations: Migration Considerations:
1) Shorewall supports the notion of "default actions". A default 1) Shorewall supports the notion of "default actions". A default
@ -84,9 +87,9 @@ Migration Considerations:
Shorewall version 3.3. Otherwise, please see item 3) in the New Shorewall version 3.3. Otherwise, please see item 3) in the New
Features below. Features below.
2) The 'Limit' action is now a builtin. If you have 'Limit' liarws in 2) The 'Limit' action is now a builtin. If you have 'Limit' listed in
/etc/shorewall/actions, remove the entry. Also remove the files /etc/shorewall/actions, remove the entry. Also remove the files
/etc/shorewall/action.Limit and /etc/shorewall/Limit if you have /etc/shorewall/action.Limit and/or /etc/shorewall/Limit if you have
them. them.
New Features: New Features:

View File

@ -409,7 +409,7 @@ logwatch() # $1 = timeout -- if negative, prompt each time that
echo "$banner $(date)" echo "$banner $(date)"
echo echo
echo "Dropped/Rejected Packet Log" echo "Dropped/Rejected Packet Log ($LOGFILE)"
echo echo
show_reset show_reset
@ -976,7 +976,7 @@ show_command() {
;; ;;
log) log)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && usage 1
echo "Shorewall-$version Log at $HOSTNAME - $(date)" echo "Shorewall-$version Log ($LOGFILE) at $HOSTNAME - $(date)"
echo echo
show_reset show_reset
host=$(echo $HOSTNAME | sed 's/\..*$//') host=$(echo $HOSTNAME | sed 's/\..*$//')