summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2008-04-27 21:16:36 +0000
committerScott Ullrich <sullrich@pfsense.org>2008-04-27 21:16:36 +0000
commitc10fac28fb7f773ac4443e958fc1a6831c2b7b07 (patch)
tree5982c2d35d9f9dab43f1064c25ab2a7e6c9c7784
parentef893d1975507c32a1a0c8473521680feb281692 (diff)
downloadpfsense-c10fac28fb7f773ac4443e958fc1a6831c2b7b07.zip
pfsense-c10fac28fb7f773ac4443e958fc1a6831c2b7b07.tar.gz
Record the CERTNAME instead of using the certkey which gets modified
by config xml handling code.
-rw-r--r--usr/local/www/vpn_openvpn_certs.php7
-rw-r--r--usr/local/www/vpn_openvpn_certs_create.php1
2 files changed, 7 insertions, 1 deletions
diff --git a/usr/local/www/vpn_openvpn_certs.php b/usr/local/www/vpn_openvpn_certs.php
index 1c212be..2038f45 100644
--- a/usr/local/www/vpn_openvpn_certs.php
+++ b/usr/local/www/vpn_openvpn_certs.php
@@ -87,7 +87,12 @@ include("head.inc");
<?php foreach ($certificates as $cert => $ca) { ?>
<tr class="vtable">
<td class="listlr" width="35%">
- <?=$cert;?>
+ <?php
+ if($ca['caname'])
+ echo $ca['caname'];
+ else
+ echo $cert;
+ ?>
</td>
<td class="listr" width="60%">
<?=$ca['caexpire'];?>
diff --git a/usr/local/www/vpn_openvpn_certs_create.php b/usr/local/www/vpn_openvpn_certs_create.php
index 6ad4b98..059a2bf 100644
--- a/usr/local/www/vpn_openvpn_certs_create.php
+++ b/usr/local/www/vpn_openvpn_certs_create.php
@@ -218,6 +218,7 @@ function edit_mode() {
conf_mount_ro();
/* vars */
$ovpnkeys[$caname]['existing'] = "no";
+ $ovpnleys[$caname]['caname'] = $caname;
$ovpnleys[$caname]['auth_method'] = $auth_method;
$ovpnkeys[$caname]['KEYSIZE'] = $cakeysize;
$ovpnkeys[$caname]['KEYEXPIRE'] = $cakeyexpire;
OpenPOWER on IntegriCloud