diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm index f7b55be2b..049875686 100644 --- a/Shorewall/Perl/Shorewall/Providers.pm +++ b/Shorewall/Perl/Shorewall/Providers.pm @@ -501,9 +501,9 @@ sub add_a_provider( ) { if ( $optional ) { if ( $shared ) { - emit ( " error_message \"WARNING: Interface $interface is not usable -- Provider $table ($number) not Added\"" ); - } else { emit ( " error_message \"WARNING: Gateway $gateway is not reachable -- Provider $table ($number) not Added\"" ); + } else { + emit ( " error_message \"WARNING: Interface $interface is not usable -- Provider $table ($number) not Added\"" ); } } else { if ( $shared ) { @@ -788,7 +788,7 @@ sub lookup_provider( $ ) { } # -# This function is called by the compiler when it is generating the initialize() function. +# This function is called by the compiler when it is generating the detect_configuration() function. # The function emits code to set the ..._IS_USABLE interface variables appropriately for the # optional interfaces # diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index b2c570428..732b8337b 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -22,6 +22,10 @@ Changes in Shorewall 4.4.3 11) Fix IPv6 address parsing bug. +12) Add hack to work around iproute IPv6 bug in route handling + +13) Correct messages issued when an optional provider is not usable. + Changes in Shorewall 4.4.2 1) BUGFIX: Correct detection of Persistent SNAT support diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index b8aa7a9fd..0ded94307 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -192,11 +192,21 @@ Shorewall 4.4.3 4) Nested zones where the parent zone was defined by a wilecard interface (name ends with +) in /etc/shorewall/interfaces did - not work correctly in all cases. + not work correctly in some cases. 5) IPv4 addresses embedded in IPv6 (e.g., ::192.168.1.5) were incorrectly reported as invalid. +6) The messages issued when an optional provider was not usable were + confusing; the message intended to be issued when the provider + shared an interface (WARNING: Gateway is not reachable -- + Provider () not Added) was being issued when the + provider did not share an interface. Similarly, the message + intended to be issued when the provider did not share an interface + (WARNING: Interface is not usable -- Provider + () not Added) was being issued when the provider did share + an interface. + ---------------------------------------------------------------------------- K N O W N P R O B L E M S R E M A I N I N G ----------------------------------------------------------------------------