[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bc4a68812bb131be6a8413f69909bf6a3d5a89a2

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bc4a68812bb131be6a8413f69909bf6a3d5a89a2

[git]

[-- Attachment #1: Type: text/plain, Size: 2223 bytes --]

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  bc4a68812bb131be6a8413f69909bf6a3d5a89a2 (commit)
      from  c6bc0fb03e0dbb9f1ba34d42195d0601b55891c1 (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 bc4a68812bb131be6a8413f69909bf6a3d5a89a2
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Mon Oct 31 12:19:15 2016 +0100

    BUG11242: Fix for adding 2 VPN Hosts/network with same name
    
    If one has an IPSec network named "aaa" and an OpenVPn Host with the same name
    it was not possible to group them together because of the same name.
    Now the Network type is also checked wich allows Entries with same name, but different networks.
    
    Fixes: #11242
    
    Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

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

Difference in files:
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 35afad3..1b0fe07 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -624,9 +624,9 @@ if ($fwhostsettings{'ACTION'} eq 'savegrp')
 		}
 		#check if host/net exists in grp
 		
-		my $test="$grp,$fwhostsettings{'oldremark'},@target";
+		my $test="$grp,$fwhostsettings{'oldremark'},@target,$type";
 		foreach my $key (keys %customgrp) {
-			my $test1="$customgrp{$key}[0],$customgrp{$key}[1],$customgrp{$key}[2]";
+			my $test1="$customgrp{$key}[0],$customgrp{$key}[1],$customgrp{$key}[2],$customgrp{$key}[3]";
 			if ($test1 eq $test){
 				$errormessage=$Lang::tr{'fwhost err isingrp'};
 				$fwhostsettings{'update'} = 'on';


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