From 4dedc26d9ed608cca0c895df03ed22c7bb9ceb03 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 25 Feb 2010 07:50:17 -0800 Subject: [PATCH 1/2] Correct handling of NFQUEUE(queue-num) as a policy. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Chains.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index 7b170ecd6..dc46e0438 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -635,7 +635,11 @@ sub add_jump( $$$;$$$ ) { # # Ensure that we have the chain unless it is a builtin like 'ACCEPT' # - $toref = ensure_chain( $fromref->{table} , $to ) unless $builtin_target{ $to }; + my $target = $to; + + $target =~ s/\s.*//; # $to might hold something like 'NFQUEUE --queue-num 0' + + $toref = ensure_chain( $fromref->{table} , $to ) unless $builtin_target{ $target }; } # From dd004bacb979cd3d2c51255b89ee97c98934d2e6 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 25 Feb 2010 07:51:08 -0800 Subject: [PATCH 2/2] Belatedly update some version numbers Signed-off-by: Tom Eastep --- Shorewall/Contrib/swping | 2 +- Shorewall/Contrib/swping.init | 2 +- Shorewall/lib.base | 2 +- Shorewall/lib.cli | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Shorewall/Contrib/swping b/Shorewall/Contrib/swping index ebcfa2b1a..7385555ab 100644 --- a/Shorewall/Contrib/swping +++ b/Shorewall/Contrib/swping @@ -1,6 +1,6 @@ #!/bin/sh # -# Shorewall WAN Interface monitor - V4.2 +# Shorewall WAN Interface monitor - V4.4 # # Inspired by Angsuman Chakraborty's gwping script. # diff --git a/Shorewall/Contrib/swping.init b/Shorewall/Contrib/swping.init index 5cdfafeb5..7136e4910 100755 --- a/Shorewall/Contrib/swping.init +++ b/Shorewall/Contrib/swping.init @@ -1,5 +1,5 @@ #!/bin/sh -# Shorewall WAN Interface monitor - V4.2 +# Shorewall WAN Interface monitor - V4.4 # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # diff --git a/Shorewall/lib.base b/Shorewall/lib.base index 61700587d..c88b223c8 100644 --- a/Shorewall/lib.base +++ b/Shorewall/lib.base @@ -1,6 +1,6 @@ #!/bin/sh # -# Shorewall 4.2 -- /usr/share/shorewall/lib.base +# Shorewall 4.4 -- /usr/share/shorewall/lib.base # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli index 6076f8920..33e9ceceb 100644 --- a/Shorewall/lib.cli +++ b/Shorewall/lib.cli @@ -1,6 +1,6 @@ #!/bin/sh # -# Shorewall 4.2 -- /usr/share/shorewall/lib.cli. +# Shorewall 4.4 -- /usr/share/shorewall/lib.cli. # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] #