From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 65f2f43b0a920615ec0db41aa1a99b3f72f1b690
Date: Tue, 30 Jan 2024 17:43:26 +0000 [thread overview]
Message-ID: <4TPXZl15Zkz2xP9@people01.haj.ipfire.org> (raw)
[-- 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
reply other threads:[~2024-01-30 17:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4TPXZl15Zkz2xP9@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox