diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-08-05 22:24:17 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-08-05 22:24:17 +0000 |
| commit | c542897782c6c0e6dcc00effef5ecf51fee57b15 (patch) | |
| tree | cb267c3f837d207e4edba386d8e8d664a4dcea46 /etc/inc/openvpn.inc | |
| parent | 3134528d8449514a7378bf245179a8e2124c820a (diff) | |
| download | pfsense-c542897782c6c0e6dcc00effef5ecf51fee57b15.zip pfsense-c542897782c6c0e6dcc00effef5ecf51fee57b15.tar.gz | |
Try to do better sanity checks.
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index c2d2e28..bc81715 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -700,7 +700,7 @@ function openvpn_restore_all_ciphers() { $ovpncapath = $g['varetc_path']."/openvpn/certificates"; - if (is_array($config['openvpn']['keys'])) { + if (is_array($config['openvpn']['keys']) && count($config['openvpn']['keys'])) { if (!is_dir($g['varetc_path']."/openvpn")) safe_mkdir($g['varetc_path']."/openvpn"); if (!is_dir($ovpncapath)) @@ -762,8 +762,9 @@ function openvpn_resync_all() { foreach (array('server', 'client') as $mode) { if ($config['installedpackages']["openvpn$mode"]) { - if (is_array($config['installedpackages']["openvpn$mode"]['config'])) { - foreach ($config['installedpackages']["openvpn$mode"]['config'] as $id => $settings) + $cfgp =& $config['installedpackages']["openvpn$mode"]; + if (is_array($cfgp['config']) && count($cfgp['config'])) { + foreach ($cfgp['config'] as $id => $settings) openvpn_resync($mode, $id); } } @@ -771,8 +772,9 @@ function openvpn_resync_all() { openvpn_create_cscdir(); if ($config['installedpackages']['openvpncsc']) { - if (is_array($config['installedpackages']['openvpncsc']['config'])) { - foreach ($config['installedpackages']['openvpncsc']['config'] as $id => $csc) + $cfgp =& $config['installedpackages']['openvpncsc']; + if (is_array($cfgp['config']) && count($cfgp['config'])) { + foreach ($cfgp['config'] as $id => $csc) openvpn_resync_csc($id); } } |
