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

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

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2370 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  65f2f43b0a920615ec0db41aa1a99b3f72f1b690 (commit)
       via  31269e52cb47dab4bfd404b5d95842461d33f7df (commit)
       via  fc4b02df53bc8c2e584281eec104a0647044649c (commit)
       via  7e8fc770bdd3bbeb98ba281208c2e735e46dee09 (commit)
      from  0bbbac793499507a22f810c55f8a84f4dbec1b6e (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 65f2f43b0a920615ec0db41aa1a99b3f72f1b690
Merge: 0bbbac793 31269e52c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jan 30 17:43:10 2024 +0000

    Merge branch 'master' into next

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

Summary of changes:
 config/rootfiles/oldcore/183/filelists/files | 1 +
 html/cgi-bin/vpnmain.cgi                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/oldcore/183/filelists/files b/config/rootfiles/oldcore/183/filelists/files
index 8839504f4..b89f6e95c 100644
--- a/config/rootfiles/oldcore/183/filelists/files
+++ b/config/rootfiles/oldcore/183/filelists/files
@@ -4,6 +4,7 @@ etc/rc.d/init.d/networking/red.up/60-collectd
 srv/web/ipfire/cgi-bin/dhcp.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/local/bin/backupiso
 var/ipfire/backup/bin/backup.pl
 var/ipfire/header.pl
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 63f875c6a..53507305f 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -244,7 +244,7 @@ sub callssl ($) {
 sub getCNfromcert ($) {
 	#&General::log("ipsec", "Extracting name from $_[0]...");
 	my $temp = `/usr/bin/openssl x509 -text -in $_[0]`;
-	$temp =~ /Subject:.*CN = (.*)[\n]/;
+	$temp =~ /Subject:.*CN\s*=\s*(.*)[\n]/;
 	$temp = $1;
 	$temp =~ s+/Email+, E+;
 	$temp =~ s/ ST = / S = /;


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