diff --git a/Shorewall-lite/changelog.txt b/Shorewall-lite/changelog.txt index db33a4f62..6196ab88f 100644 --- a/Shorewall-lite/changelog.txt +++ b/Shorewall-lite/changelog.txt @@ -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 1) Update Versions. diff --git a/Shorewall-lite/releasenotes.txt b/Shorewall-lite/releasenotes.txt index 23195c2e5..4e5e712f3 100644 --- a/Shorewall-lite/releasenotes.txt +++ b/Shorewall-lite/releasenotes.txt @@ -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. -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. diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index e54fe9fbc..0485233e6 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -349,7 +349,7 @@ logwatch() # $1 = timeout -- if negative, prompt each time that echo "$banner $(date)" echo - echo "Dropped/Rejected Packet Log" + echo "Dropped/Rejected Packet Log ($LOGFILE)" echo show_reset @@ -734,7 +734,7 @@ show_command() { ;; log) [ $# -gt 1 ] && usage 1 - echo "Shorewall Lite $version Log at $HOSTNAME - $(date)" + echo "Shorewall Lite $version Log ($LOGFILE) at $HOSTNAME - $(date)" echo show_reset host=$(echo $HOSTNAME | sed 's/\..*$//') diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index bfec86c16..a41939194 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -4,5 +4,9 @@ Changes in 3.3.1 2) Implement default action/macros at the individual policy level. +3) Add logfile name to output of "shorewall show log" and "shorewall + logwatch". + + diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index c286ada28..4bdfa8e91 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -47,7 +47,10 @@ Other changes in 3.3.2 1) /etc/shorewall/functions has been renamed /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: @@ -84,9 +87,9 @@ Migration Considerations: Shorewall version 3.3. Otherwise, please see item 3) in the New 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/action.Limit and /etc/shorewall/Limit if you have + /etc/shorewall/action.Limit and/or /etc/shorewall/Limit if you have them. New Features: diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 01558d29a..dc8dbbe3c 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -409,7 +409,7 @@ logwatch() # $1 = timeout -- if negative, prompt each time that echo "$banner $(date)" echo - echo "Dropped/Rejected Packet Log" + echo "Dropped/Rejected Packet Log ($LOGFILE)" echo show_reset @@ -976,7 +976,7 @@ show_command() { ;; log) [ $# -gt 1 ] && usage 1 - echo "Shorewall-$version Log at $HOSTNAME - $(date)" + echo "Shorewall-$version Log ($LOGFILE) at $HOSTNAME - $(date)" echo show_reset host=$(echo $HOSTNAME | sed 's/\..*$//')