Eliminate extra newline in WARNING message

This commit is contained in:
Tom Eastep 2011-03-12 14:06:50 -08:00
parent 68b15c9544
commit 8383a6e75a
3 changed files with 15 additions and 0 deletions

View File

@ -2942,6 +2942,7 @@ sub get_params() {
s/"$//; s/"$//;
$params{$variable} .= $_; $params{$variable} .= $_;
} else { } else {
chomp;
warning_message "Param line ($_) ignored" unless $bug++; warning_message "Param line ($_) ignored" unless $bug++;
} }
} }
@ -2967,6 +2968,7 @@ sub get_params() {
s/"$//; s/"$//;
$params{$variable} .= $_; $params{$variable} .= $_;
} else { } else {
chomp;
warning_message "Param line ($_) ignored" unless $bug++; warning_message "Param line ($_) ignored" unless $bug++;
} }
} }
@ -2991,6 +2993,7 @@ sub get_params() {
s/'$//; s/'$//;
$params{$variable} .= $_; $params{$variable} .= $_;
} else { } else {
chomp;
warning_message "Param line ($_) ignored" unless $bug++; warning_message "Param line ($_) ignored" unless $bug++;
} }
} }

View File

@ -1,3 +1,7 @@
Changes in Shorewall 4.4.18.1
1) Fix params processing bug.
Changes in Shorewall 4.4.18 Final Changes in Shorewall 4.4.18 Final
1) Correct handling of IPv6 host address in a net context. 1) Correct handling of IPv6 host address in a net context.

View File

@ -13,6 +13,14 @@ 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 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.18.1
1) An issue with params processing on RHEL6 has been corrected. The
problem manifested as the following type of warning:
WARNING: Param line (export OLDPWD) ignored at
/usr/share/shorewall/Shorewall/Config.pm line 2993.4.4.18 Final
4.4.18 Final 4.4.18 Final
1) Previously, if an IPv6 host address (no "/<vlsm>") was used in a 1) Previously, if an IPv6 host address (no "/<vlsm>") was used in a