diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-28 10:19:40 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-28 10:19:40 -0300 |
| commit | 43652f2fecfeb7ed4de28d697d515197ff1e3100 (patch) | |
| tree | 962805777516af930939b2a9194927108d8a8319 /etc/inc/openvpn.inc | |
| parent | ad9db2a956814c4e04188b177e37061e7b310472 (diff) | |
| parent | 7eab33095e8f2293a43ec03c7c6bf002c084bdb2 (diff) | |
| download | pfsense-43652f2fecfeb7ed4de28d697d515197ff1e3100.zip pfsense-43652f2fecfeb7ed4de28d697d515197ff1e3100.tar.gz | |
Merge remote branch 'mainline/master' into inc
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index d150dd5..1e7e9b8 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -506,8 +506,10 @@ function openvpn_reconfigure($mode,& $settings) { openvpn_add_keyfile($cert['prv'], $conf, $mode_id, "key"); if ($mode == 'server') $conf .= "dh {$g['etc_path']}/dh-parameters.{$settings['dh_length']}\n"; - if ($settings['crl']) - openvpn_add_keyfile($settings['crl'], $conf, $mode_id, "crl-verify"); + if (!empty($settings['crlref'])) { + $crl = lookup_crl($settings['crlref']); + openvpn_add_keyfile($crl['text'], $conf, $mode_id, "crl-verify"); + } if ($settings['tls']) { if (stristr($settings['mode'], "server")) $tlsopt = 0; |
