extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-17 02:00:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix log record displays

Browse Source
This commit is contained in:
Tom Eastep 2009-08-07 13:33:07 -07:00
parent c34e09cd67
commit 55c879e4e6
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/changelog.txt
View File

@ -4,6 +4,8 @@ Changes in Shorewall 4.4.0
2) Fix rule generation for logging nat rules with no exclusion.
3) Fix log record formatting.
Changes in Shorewall 4.4.0-RC2
1) Fix capabilities file with Shorewall6.

2
Shorewall/lib.cli
View File

@ -151,8 +151,6 @@ syslog_circular_buffer() {
#
packet_log() # $1 = number of messages
{
local options
if [ -n "$SHOWMACS" -o $VERBOSE -gt 2 ]; then
$LOGREAD | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
else

4
Shorewall/releasenotes.txt
View File

@ -169,6 +169,10 @@ Shorewall 4.4.0
ERROR: Command "/sbin/iptables -A log0 -j REDIRECT --to-port
82" Failed
3) Previously, log displays from the dump, show and logwatch commands
did not properly suppress redundant fields in the records (host
name, and leading constant part of the LOGPREFIX).
----------------------------------------------------------------------------
K N O W N P R O B L E M S R E M A I N I N G
----------------------------------------------------------------------------

4
Shorewall/shorewall
View File

@ -301,9 +301,9 @@ get_config() {
;;
esac
[ -n "LOGFORMAT" ] && LOGFORMAT="${LOGFORMAT%%%*}"
[ -z "$LOGFORMAT" ] && LOGFORMAT='Shorewall:%s.%s'
[ -n "$LOGFORMAT" ] || LOGFORMAT="Shorewall:"
[ -n "$LOGFORMAT" ] && LOGFORMAT="${LOGFORMAT%%%*}"
export LOGFORMAT

2
Shorewall6/lib.cli
View File

@ -132,8 +132,6 @@ syslog_circular_buffer() {
#
packet_log() # $1 = number of messages
{
local options
if [ -n "$SHOWMACS" -o $VERBOSE -gt 2 ]; then
$LOGREAD | grep 'IN=.* OUT=.*SRC=.*:.*DST=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
else

4
Shorewall6/shorewall6
View File

@ -218,9 +218,9 @@ get_config() {
;;
esac
[ -n "LOGFORMAT" ] && LOGFORMAT="${LOGFORMAT%%%*}"
[ -n "$LOGFORMAT" ] || LOGFORMAT='Shorewall6:%s.%s'
[ -n "$LOGFORMAT" ] || LOGFORMAT="Shorewall6:"
[ -n "$LOGFORMAT" ] && LOGFORMAT="${LOGFORMAT%%%*}"
export LOGFORMAT