From 8c32e798c4949f4aa9392802ce0ec6b156aaffed Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 28 Aug 2016 13:19:26 +0200 Subject: [PATCH] openvpn/ipsec: properly handle interface deletion artefact The array was still there, and even though empty evaluated as being filled with data that requires an interface. --- src/etc/inc/plugins.inc.d/if_ipsec.inc | 3 +-- src/etc/inc/plugins.inc.d/if_openvpn.inc | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/if_ipsec.inc b/src/etc/inc/plugins.inc.d/if_ipsec.inc index b5fb9f15a..e76e9be65 100644 --- a/src/etc/inc/plugins.inc.d/if_ipsec.inc +++ b/src/etc/inc/plugins.inc.d/if_ipsec.inc @@ -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'; diff --git a/src/etc/inc/plugins.inc.d/if_openvpn.inc b/src/etc/inc/plugins.inc.d/if_openvpn.inc index 4610326c8..3c4aa6ca3 100644 --- a/src/etc/inc/plugins.inc.d/if_openvpn.inc +++ b/src/etc/inc/plugins.inc.d/if_openvpn.inc @@ -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';