On 12/30/12 11:49 AM, Steven Jan Springl wrote: > On Sunday 30 Dec 2012 19:44:30 Tom Eastep wrote: >> On 12/30/2012 11:17 AM, Steven Jan Springl wrote: >>> When TC_ENABLED=Simple, Shorewall accepts the following tcpri entry: >>> >>> 1 - - 1.1.1.1 - ftp >>> >>> If a port number is appended to the helper: >>> >>> 1 - - 1.1.1.1 - ftp-21 >>> >>> The following error message is produced: >>> >>> ERROR: The helper is not enabled /etc/shorewall2A10/tcpri (line 18) >> >> I'm having difficulty reproducing this -- please forward a capabilities >> file. > > I have attached the shorewall config. which includes the capabilities file. >
The attached patch corrects the problem. Thanks Steven, -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________
diff --git a/Shorewall/Perl/Shorewall/Chains.pm
b/Shorewall/Perl/Shorewall/Chains.pm
index 8820e00..3b4d303 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -4467,14 +4467,14 @@ sub validate_helper( $;$ ) {
#
# Recognized helper
#
- my $capability = $helpers_map{$helper};
+ my $capability = $helpers_map{defined $proto ? $helper :
$helper_base};
my $external_helper = lc $capability;
$external_helper =~ s/_helper//;
$external_helper =~ s/_/-/;
fatal_error "The $external_helper helper is not enabled" unless
$helpers_enabled{$external_helper};
-
+
if ( supplied $proto ) {
require_capability $helpers_map{$helper}, "Helper $helper", 's';
@@ -4501,7 +4501,9 @@ sub do_helper( $ ) {
validate_helper( $helper );
- qq(-m helper --helper "$helpers_aliases{$helper}" ) if defined wantarray;
+ $helper = $helpers_aliases{$helper} || $helper;
+
+ qq(-m helper --helper $helper ) if defined wantarray;
}
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnmore_123012
_______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
