From f02c3e1de372cc1d08c6690305de934d2304ef27 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 5 May 2011 16:47:49 -0400
Subject: Misc OpenVPN CRL selection fixes.

---
 usr/local/www/vpn_openvpn_server.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'usr/local/www/vpn_openvpn_server.php')

diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index 4577673..4a24e2e 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -787,13 +787,16 @@ if ($savemsg)
 								<option value="">None</option>
 							<?php
 								foreach ($a_crl as $crl):
-									if (is_crl_internal($crl) && (count($crl['cert']) <= 0))
-										continue;
 									$selected = "";
-									if ($pconfig['crlref'] == $crl['refid'])
-										$selected = "selected";
+									$caname = "";
+									$ca = lookup_ca($crl['caref']);
+									if ($ca) {
+										$caname = " (CA: {$ca['descr']})";
+										if ($pconfig['crlref'] == $crl['refid'])
+											$selected = "selected";
+									}
 							?>
-								<option value="<?=$crl['refid'];?>" <?=$selected;?>><?=$crl['descr'];?></option>
+								<option value="<?=$crl['refid'];?>" <?=$selected;?>><?=$crl['descr'] . $caname;?></option>
 							<?php endforeach; ?>
 							</select>
 							</td>
-- 
cgit v1.1