From 63b501996e2ae9bd07e87c5de33d1b4de0e6f1de Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 21 Feb 2016 12:26:39 -0800 Subject: [PATCH] Require ADDRTYPE for DOCKER=Yes Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 86599d9d0..6d4e7af00 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -5861,9 +5861,11 @@ sub get_configuration( $$$$ ) { default_yes_no 'WORKAROUNDS' , 'Yes'; default_yes_no 'DOCKER' , ''; - fatal_error "DOCKER=Yes is not allowed in Shorewall6" if $family == F_IPV6; - - require_capability( 'IPTABLES_S', 'DOCKER=Yes', 's' ) if $config{DOCKER}; + if ( $config{DOCKER} ) { + fatal_error "DOCKER=Yes is not allowed in Shorewall6" if $family == F_IPV6; + require_capability( 'IPTABLES_S', 'DOCKER=Yes', 's' ); + require_capability( 'ADDRTYPE', ' DOCKER=Yes', 's' ); + } if ( supplied( $val = $config{RESTART} ) ) { fatal_error "Invalid value for RESTART ($val)" unless $val =~ /^(restart|reload)$/;