diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-04-12 10:40:44 +0200 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-04-12 10:40:44 +0200 |
| commit | af8f910eebb9c86a034ea4e07546f41fca16b37c (patch) | |
| tree | 125deaadc7bff0668570c0959d4fe862707a10bd /etc/inc/upgrade_config.inc | |
| parent | 86966fba757f554967773f518ef707f461b84636 (diff) | |
| parent | 127eb8e0238061ca8a66e25c2089dddc1826ec4d (diff) | |
| download | pfsense-af8f910eebb9c86a034ea4e07546f41fca16b37c.zip pfsense-af8f910eebb9c86a034ea4e07546f41fca16b37c.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc/upgrade_config.inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 2ffa7ed..5104940 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; |
