On Sat, 2011-07-09 at 17:55 -0700, Tom Eastep wrote: > On Sun, 2011-07-10 at 01:47 +0100, Steven Jan Springl wrote: > > > The patch does not apply. Hunk one fails. > > > > This patch is IPSET8 the previous was IPSET6. Should there be an IPSET7? > > Steven, > > I'm not sure what happened. Please verify the patches against the Git > repository at Sourceforge (branch 4.4.21). > > A quick look at the last two patches suggests that they are the same as > the last two I sent you.
See if this helps. -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/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm
index 9d1ca06..feb8097 100644
--- a/Shorewall/Perl/Shorewall/Zones.pm
+++ b/Shorewall/Perl/Shorewall/Zones.pm
@@ -1731,7 +1731,7 @@ sub process_host( ) {
}
} elsif ( $hosts =~ /^([\w.@%-]+\+?):<(.*)>$/ ||
$hosts =~ /^([\w.@%-]+\+?):\[(.*)\]$/ ||
- $hosts =~ /^([\w.@%-]+\+?):(\+.*)$/ ||
+ $hosts =~ /^([\w.@%-]+\+?):(!?\+.*)$/ ||
$hosts =~ /^([\w.@%-]+\+?):(dynamic)$/ ) {
$interface = $1;
$hosts = $2;
@@ -1741,7 +1741,7 @@ sub process_host( ) {
fatal_error "Invalid HOST(S) column contents: $hosts"
}
- if ( $hosts =~ /^\+/ ) {
+ if ( $hosts =~ /^!?\+/ ) {
$zoneref->{options}{complex} = 1;
fatal_error "ipset name qualification is disallowed in this file" if $hosts =~ /[\[\]]/;
fatal_error "Invalid ipset name ($hosts)" unless $hosts =~ /^\+[a-zA-Z][-\w]*$/;
signature.asc
Description: This is a digitally signed message part
------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
