summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-04-06 13:36:24 -0400
committerjim-p <jimp@pfsense.org>2011-04-06 13:36:24 -0400
commitab75b4ee5475fe1be718cb0e93d0a34f293c5ed0 (patch)
tree68c27ac1ae7b087dd30fb71e0af4b3fee5da1a6c
parent6177fd924c8eb8e946594fca9d55fd24acae8c4a (diff)
downloadpfsense-ab75b4ee5475fe1be718cb0e93d0a34f293c5ed0.zip
pfsense-ab75b4ee5475fe1be718cb0e93d0a34f293c5ed0.tar.gz
CRL is read in as an array now, so even in the imported config it will appear to be an array even though it can only have one value. Fixes #1358
-rw-r--r--etc/inc/upgrade_config.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index de5c600..805bbcc 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1470,12 +1470,12 @@ function upgrade_051_to_052() {
$server['caref'] = $ca['refid'];
/* create a crl entry if needed */
- if (!empty($server['crl'])) {
+ if (!empty($server['crl'][0])) {
$crl = array();
$crl['refid'] = uniqid();
$crl['descr'] = "Imported OpenVPN CRL #{$index}";
$crl['caref'] = $ca['refid'];
- $crl['text'] = $server['crl'];
+ $crl['text'] = $server['crl'][0];
if(!is_array($config['crl']))
$config['crl'] = array();
$config['crl'][] = $crl;
OpenPOWER on IntegriCloud