lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvpn/ipsec: properly handle interface deletion artefact

Browse Source 
The array was still there, and even though empty evaluated as
being filled with data that requires an interface.
This commit is contained in:
Franco Fichtner 2016-08-28 13:19:26 +02:00
parent 47c3fee71e
commit 8c32e798c4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/etc/inc/plugins.inc.d/if_ipsec.inc
View File

@ -64,8 +64,7 @@ function if_ipsec_interfaces()
$interfaces = array();
/* add ipsec interfaces */
if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) {
if (isset($config['ipsec']['phase1']) && count($config['ipsec']['phase1'])) {
$oic = array("enable" => true);
$oic['if'] = 'enc0';
$oic['descr'] = 'IPsec';

4
src/etc/inc/plugins.inc.d/if_openvpn.inc
View File

@ -73,8 +73,8 @@ function if_openvpn_interfaces()
$interfaces = array();
/* add openvpn interfaces */
if (isset($config['openvpn']['openvpn-server']) || isset($config['openvpn']['openvpn-client'])) {
if ((isset($config['openvpn']['openvpn-server']) && count($config['openvpn']['openvpn-server'])) ||
(isset($config['openvpn']['openvpn-client']) && count($config['openvpn']['openvpn-client']))) {
$oic = array("enable" => true);
$oic['if'] = "openvpn";
$oic['descr'] = 'OpenVPN';