From 6148c909f2088867a917f8c6dd94d2094f2a0e88 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 16 May 2012 19:52:41 -0700
Subject: [PATCH] fix multiple ipsets in an imatch

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Chains.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index da730737f..6036bb6c0 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -4707,10 +4707,10 @@ sub imatch_source_net( $;$\$ ) {
 
 	for $net ( @sets ) {
 	    fatal_error "Expected ipset name ($net)" unless $net =~ /^(!?)(\+?)[a-zA-Z][-\w]*(\[.*\])?/;
-	    push @result, join( '', $1 ? '! ' : '', get_set_flags( $net, 'src' ) );
+	    push @result , ( set => join( '', $1 ? '! ' : '', get_set_flags( $net, 'src' ) ) );
 	}
 
-	return ( s => \@result );
+	return \@result;
     }
 
     if ( $net =~ s/^!// ) {
@@ -4806,7 +4806,7 @@ sub imatch_dest_net( $ ) {
 	    push @result , ( set => join( '', $1 ? '! ' : '', get_set_flags( $net, 'dst' ) ) );
 	}
 
-	return ( set => \@result );
+	return \@result;
     }
 
     if ( $net =~ s/^!// ) {