From 130ddff9dece1658aa640c95311a0e3d3bb36a21 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 10 Nov 2017 11:25:52 -0800 Subject: [PATCH] Correct a typo in an error message - Includes cosmetic changes to Providers.pm Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Providers.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm index 89bf3c0a6..2d0379678 100644 --- a/Shorewall/Perl/Shorewall/Providers.pm +++ b/Shorewall/Perl/Shorewall/Providers.pm @@ -125,7 +125,7 @@ sub initialize( $ ) { # Set up marking for 'tracked' interfaces. # sub setup_route_marking() { - my $mask = in_hex( $globals{PROVIDER_MASK} ); + my $mask = in_hex( $globals{PROVIDER_MASK} ); my $exmask = have_capability( 'EXMARK' ) ? "/$mask" : ''; require_capability( $_ , q(The provider 'track' option) , 's' ) for qw/CONNMARK_MATCH CONNMARK/; @@ -692,7 +692,6 @@ sub process_a_provider( $ ) { $pref = 10000 + $number - 1; } - } unless ( $loose || $pseudo ) { @@ -1700,7 +1699,7 @@ sub process_providers( $ ) { } if ( $providers ) { - fatal_error q(Either all 'fallback' providers must specify a weight or non of them can specify a weight) if $fallback && $metrics; + fatal_error q(Either all 'fallback' providers must specify a weight or none of them can specify a weight) if $fallback && $metrics; my $fn = open_file( 'route_rules' ); @@ -1939,7 +1938,6 @@ sub setup_providers() { emit "fi\n"; } - } #