From 70248550e242e15d9668d4af42bbb03e438e744a Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sun, 5 Sep 2010 17:18:43 +0200 Subject: [PATCH 1/1] Be a little more robust. --- config/outgoingfw/outgoingfw.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index e2f9093f0d..8d4d27d313 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -153,12 +153,12 @@ foreach $configentry (sort @configs) } elsif ($configline[2] eq 'ip') { @SOURCE = ("$configline[5]"); $DEV = ""; - } elsif ($configline[2] eq 'all') { - @SOURCE = ("0/0"); - $DEV = ""; } elsif ($configline[2] eq 'mac') { @SOURCE = ("$configline[6]"); $DEV = ""; + } elsif ($configline[2] eq 'all') { + @SOURCE = ("0/0"); + $DEV = ""; } else { if ( -e "/var/ipfire/outgoing/groups/ipgroups/$configline[2]" ) { @SOURCE = `cat /var/ipfire/outgoing/groups/ipgroups/$configline[2]`; @@ -189,7 +189,7 @@ foreach $configentry (sort @configs) if ( $SOURCE eq "" ){next;} - if ( $configline[6] ne "" || $configline[2] eq 'mac' ){ + if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){ $SOURCE =~ s/[^a-zA-Z0-9]/:/gi; $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; } else { -- 2.39.2