diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index 3f620765b..c1dd2e83f 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -293,7 +293,7 @@ sub generate_script_2() { emit ( 'esac' ) , } else { - emit( 'true' ); + emit( 'true' ) unless handle_optional_interfaces; } pop_indent; diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm index 049875686..59d60f812 100644 --- a/Shorewall/Perl/Shorewall/Providers.pm +++ b/Shorewall/Perl/Shorewall/Providers.pm @@ -826,6 +826,8 @@ sub handle_optional_interfaces() { " ${base}_IS_USABLE=" , 'fi' ); } + + 1; } } diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 732b8337b..f9ae6094c 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -26,6 +26,8 @@ Changes in Shorewall 4.4.3 13) Correct messages issued when an optional provider is not usable. +14) Fix optional interfaces. + 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 ac5a25e0c..0e19a10e3 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -207,6 +207,9 @@ Shorewall 4.4.3 () not Added") was being issued when the provider did share an interface. +7) Under certain circumstances, optional providers were not detected + as being usable. + ---------------------------------------------------------------------------- K N O W N P R O B L E M S R E M A I N I N G ----------------------------------------------------------------------------