diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 4f3b6572f..d19f03cb5 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -2909,7 +2909,7 @@ sub get_params() { if ( /^(.*?)=(.*)$/ ) { $params{$1} = $2 unless $1 eq '_'; } else { - assert(0); + warning_message "Unrecognized output from 'env' ($_) ignored"; } } } diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 2f934bf6c..4da1ea8fd 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,7 @@ +Changes in Shorewall 4.4.15.1 + +1) Change assertion into a warning in getparams. + Changes in Shorewall 4.4.15 1) Add macros from Tuomo Soini. diff --git a/Shorewall/known_problems.txt b/Shorewall/known_problems.txt index 3141b10e9..f8dbb057e 100644 --- a/Shorewall/known_problems.txt +++ b/Shorewall/known_problems.txt @@ -1 +1,10 @@ -There are no known problems in Shorewall 4.4.15 +1) On systems running Upstart, shorewall-init cannot reliably secure + the firewall before interfaces are brought up. + +2) If the output of 'env' contains a multi-line value, then + compilation failed with an Internal Error. + + Workaround: In /etc/shorewall/params, reset any exported variables + that have a multi-line value. + + Will be fixed in 4.4.15.1 or 4.4.16, whichever is released first. diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 673322541..74877174e 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,5 +1,5 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 4 . 1 5 + S H O R E W A L L 4 . 4 . 1 5 . 1 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -13,6 +13,18 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E ---------------------------------------------------------------------------- +4.4.15.1 + +1) If the output of 'env' contained a multi-line value, then + compilation failed with an Internal Error. The code has been + changed so that the compiler now emits a warning and continues: + + WARNING: Unrecognized output from 'env' (...) ignored + + where ... is the output. + +4.4.15 + 1) Previously, if a) syn flood protection was enabled in a policy that