[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d16bcc24e4ec1c0f7f3
From:       git () ipfire ! org (Arne Fitzenreiter)
Date:       2010-09-06 19:48:04
Message-ID: 20100906194804.9B5DE20709 () argus ! ipfire ! org
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  d16bcc24e4ec1c0f7f3090ba51fdcc0529e8059e (commit)
       via  d003cffe573eb68ca3a82de35605e75f84023636 (commit)
       via  70248550e242e15d9668d4af42bbb03e438e744a (commit)
      from  bd8618f6aa2a3e251d29732c7871243c17e8bdcf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d16bcc24e4ec1c0f7f3090ba51fdcc0529e8059e
Merge: bd8618f d003cff
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date:   Mon Sep 6 21:50:49 2010 +0200

    Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes:
 config/outgoingfw/outgoingfw.pl |    8 ++++----
 html/cgi-bin/outgoingfw.cgi     |    5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index e2f9093..8d4d27d 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 {
diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index 07fcb39..27a8927 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -310,6 +310,11 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'})
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'add'})
 {
 	if ( $outfwsettings{'VALID'} eq 'yes' ) {
+
+		if ( $outfwsettings{'SNET'} eq "all" ) {
+			$outfwsettings{'SIP'} ="";
+			$outfwsettings{'SMAC'}="";
+		}
 		open( FILE, ">> $configfile" ) or die "Unable to write $configfile";
 		print FILE <<END
 $outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettin \
gs{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfws \
ettings{'DIP'};$outfwsettings{'DPORT'};$outfwsettings{'LOG'};$outfwsettings{'TIME_MON' \
};$outfwsettings{'TIME_TUE'};$outfwsettings{'TIME_WED'};$outfwsettings{'TIME_THU'};$ou \
tfwsettings{'TIME_FRI'};$outfwsettings{'TIME_SAT'};$outfwsettings{'TIME_SUN'};$outfwsettings{'TIME_FROM'};$outfwsettings{'TIME_TO'};



hooks/post-receive
--
IPFire 2.x development tree


[prev in list] [next in list] [prev in thread] [next in thread]