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 2ed474684d5f7152e34ef606d282798561e5c35f (commit) via 90c2ce0c20c8b0cdb027220f5363b51dd9195d83 (commit) via 40962f9760ce8da23ebd5c723d75775e7853943d (commit) from 0ba66e9293e106469894d84268b997a67f71e105 (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 2ed474684d5f7152e34ef606d282798561e5c35f Merge: 0ba66e9 90c2ce0 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 4 14:54:06 2014 +0100

Merge remote-tracking branch 'amarx/beta3' into next

commit 90c2ce0c20c8b0cdb027220f5363b51dd9195d83 Author: Alexander Marx alexander.marx@ipfire.org Date: Tue Mar 4 14:51:20 2014 +0100

Firewall: get rid of /32 subnetz when using manual ip addresses

commit 40962f9760ce8da23ebd5c723d75775e7853943d Author: Alexander Marx alexander.marx@ipfire.org Date: Tue Mar 4 14:40:59 2014 +0100

Firewall: Bugfix - when creating a new hostgroup, the system checked for existing name in servicegroups instead of hostgroups

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

Summary of changes: html/cgi-bin/firewall.cgi | 2 +- html/cgi-bin/fwhosts.cgi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

Difference in files: diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 9f960b4..52bac58 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1571,7 +1571,7 @@ sub newrule my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}}); if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;} my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}}); - if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;} + if ($dcidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;} &Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'}); #------SOURCE------------------------------------------------------- print "<form method='post'>"; diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 34d43f3..049233c 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -2014,7 +2014,7 @@ sub checkname } sub checkgroup { - &General::readhasharray("$configsrvgrp", %customservicegrp ); + &General::readhasharray("$configgrp", %customgrp ); my $name=shift; foreach my $key (keys %customservicegrp) { if($customservicegrp{$key}[0] eq $name){

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