Merge branch 'master' into next

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

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 = /;