From 2de53c3fa6e965deed4f19ae12840d3cb22a1c75 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 5 Jun 2019 11:11:13 +0200 Subject: [PATCH] openvpn: guard doesn't make a lot of sense here --- src/etc/inc/interfaces.inc | 1 + src/etc/inc/plugins.inc.d/openvpn.inc | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 840352f27..3221630d2 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2400,6 +2400,7 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal interfaces_vlan_configure(false, $interface_to_check); interfaces_lagg_configure(false, $interface_to_check); interfaces_bridge_configure(false, 0, $interface_to_check); + /* XXX weird: create interface, but maybe do not start yet */ plugins_configure('openvpn_reload', false, array($interface)); } diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc index 669ee6dbe..b7f815055 100644 --- a/src/etc/inc/plugins.inc.d/openvpn.inc +++ b/src/etc/inc/plugins.inc.d/openvpn.inc @@ -1197,12 +1197,6 @@ function openvpn_configure_do($verbose = false, $interface = '', $carp_event = f } if (!empty($interface)) { - /* protect reload by ignoring unassociated devices */ - $realif = get_real_interface($interface); - if (!strstr($realif, 'ovpn') && !strstr($realif, '_vip')) { - return; - } - log_error(sprintf( 'Resyncing OpenVPN instances for interface %s.', convert_friendly_interface_to_friendly_descr($interface)