diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 40bef0610..b14795a8b 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -6,6 +6,8 @@ Changes in 3.4.0 Final 3) Fix restoration of ip range dynamic entries. +4) Fix exit status problem with 'restart' + Changes in 3.4.0 RC 2 1) No longer include params file in compiled output. diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index d21b87b46..75d887064 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -37,6 +37,9 @@ Problems Corrected in 3.4.0 Final time that Shorewall was restarted, new connections from outside the firewall were totally blocked. +3) If a 'shorewall restart' command failed during the compile phase, + /sbin/shorewall erroneously returned an exit status of 0. + Other Changes in 3.4.0 Final 1) A warning is now issued when 'loose' and 'balance' are specified together diff --git a/Shorewall/shorewall b/Shorewall/shorewall index d08577a89..1579fca36 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -550,8 +550,8 @@ restart_command() { $SHOREWALL_SHELL ${VARDIR}/.restart $debugging restart rc=$? else - logger -p kern.err "ERROR:Shorewall restart failed" rc=$? + logger -p kern.err "ERROR:Shorewall restart failed" fi [ -n "$nolock" ] || mutex_off