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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 1875 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  beac479f2d1f4ad3e758df2346b6d5f0334458ea (commit)
      from  28aacf565b1fc5c38f757c931cdfd42fa6e63051 (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 beac479f2d1f4ad3e758df2346b6d5f0334458ea
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Mon Jun 18 17:32:57 2018 +0200

    OpenVPN: Prevent that a Roadwarrior name will be set two times
    
    Fixes bug #11307
    
    Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 html/cgi-bin/ovpnmain.cgi | 10 ++++++++++
 1 file changed, 10 insertions(+)

Difference in files:
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 947cbe9e7..0bc28cefe 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -4180,6 +4180,16 @@ if ($cgiparams{'TYPE'} eq 'net') {
 		}
 	    }
 
+		# Check for RW if client name is already set
+		if ($cgiparams{'TYPE'} eq 'host') {
+			foreach my $key (keys %confighash) {
+				if ($confighash{$key}[1] eq $cgiparams{'NAME'}) {
+					$errormessage = $Lang::tr{'a connection with this name already exists'};
+					goto VPNCONF_ERROR;
+				}
+			}
+		}
+
 	    # Replace empty strings with a .
 	    (my $ou = $cgiparams{'CERT_OU'}) =~ s/^\s*$/\./;
 	    (my $city = $cgiparams{'CERT_CITY'}) =~ s/^\s*$/\./;


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