diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 032817cd3..0f0c2e3fd 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -56,3 +56,5 @@ Changes since 2.0.3 26) Allow source port remapping in /etc/shorewall/masq. 27) Include params file on 'restore' + +28) Apply Richard Musil's patch. diff --git a/Shorewall2/firewall b/Shorewall2/firewall index 157a4e6d7..4d593fa4e 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -3848,10 +3848,10 @@ process_rule() # $1 = target expandv logtag fi - if [ $loglevel = none ]; then + if [ "$loglevel" = none ]; then + [ "$target" = LOG ] && return loglevel= logtag= - [ $target = LOG ] && return fi loglevel=${loglevel%\!} diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index 5a7123f6d..44c82fb11 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 2.1.7 +Shorewall 2.1.8 ---------------------------------------------------------------------- Problems Corrected since 2.0.3 @@ -36,6 +36,10 @@ Problems corrected since 2.1.6 1) Dynamic zones marked as 'ipsec' in /etc/shorewall/ipsec now work correctly. +Problems corrected since 2.1.7 + +1) Fix parsing of ACTION with ":" but no log level (Richard Musil). + ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0 to Shorewall 2.1: