Correct the helper table.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
Allow '?IF 0'
2012-08-08 07:29:23 -07:00 · 2012-08-08 07:24:49 -07:00
2 changed files with 7 additions and 5 deletions
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@ -651,16 +651,18 @@ sub initialize( $$$ ) {

    %ipset_exists       = ();

-    %helpers = ( amanda          => TCP,
+    %helpers = ( amanda          => UDP,
 		 ftp             => TCP,
-		 h323            => UDP,
 		 irc             => TCP,
-		 netbios_ns      => UDP,
+		 'netbios-ns'    => UDP,
 		 pptp            => TCP,
+		 'Q.931'         => TCP,
+		 RAS             => UDP,
 		 sane            => TCP,
 		 sip             => UDP,
 		 snmp            => UDP,
-		 tftp            => UDP);
+		 tftp            => UDP,
+	       );

    %isocodes = ();

--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@ -1751,7 +1751,7 @@ sub process_conditional( $$$$ ) {
    my ( $lastkeyword, $prioromit, $included, $lastlinenumber ) = @ifstack ? @{$ifstack[-1]} : ('', 0, 0, 0 );

    if ( $keyword =~ /^IF/ ) {
-	cond_error( "Missing IF expression" , $filename, $linenumber ) unless $expression;
+	cond_error( "Missing IF expression" , $filename, $linenumber ) unless supplied $expression;
 	my $nextomitting = $omitting || ! evaluate_expression( $expression , $filename, $linenumber );
 	push @ifstack, [ 'IF', $omitting, ! $nextomitting, $linenumber ];
 	$omitting = $nextomitting;
Author	SHA1	Message	Date
Tom Eastep	0c1357e2a9	Correct the helper table. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-08-08 07:29:23 -07:00
Tom Eastep	e5a29c27e5	Allow '?IF 0' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2012-08-08 07:24:49 -07:00