From ae2b9e3e5eb735a4e7dbd112287c307757eac858 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 2 Aug 2023 15:26:33 +0200 Subject: [PATCH] interfaces: only include interfaces.inc It's debatable but in general *.lib.inc is side-effect-free code for the library at hand and not to be grabbed by outside scripts directly. The library will include the needed file anyway. --- src/etc/inc/plugins.inc.d/openvpn/tunnel_endpoint.php | 2 +- src/opnsense/scripts/OPNsense/Monit/carp_status | 2 +- src/opnsense/scripts/interfaces/list_interfaces.php | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/openvpn/tunnel_endpoint.php b/src/etc/inc/plugins.inc.d/openvpn/tunnel_endpoint.php index 1982b1fb9..8c64dfc81 100755 --- a/src/etc/inc/plugins.inc.d/openvpn/tunnel_endpoint.php +++ b/src/etc/inc/plugins.inc.d/openvpn/tunnel_endpoint.php @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -require_once("interfaces.lib.inc"); +require_once("interfaces.inc"); if (!empty($argv[1])) { $result = legacy_interface_details($argv[1]); diff --git a/src/opnsense/scripts/OPNsense/Monit/carp_status b/src/opnsense/scripts/OPNsense/Monit/carp_status index 0c2e1bc22..d7672b826 100755 --- a/src/opnsense/scripts/OPNsense/Monit/carp_status +++ b/src/opnsense/scripts/OPNsense/Monit/carp_status @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -require_once("interfaces.lib.inc"); +require_once("interfaces.inc"); $statuses = array(); foreach (legacy_interfaces_details() as $intf) { diff --git a/src/opnsense/scripts/interfaces/list_interfaces.php b/src/opnsense/scripts/interfaces/list_interfaces.php index 9f823f893..89084d0e1 100755 --- a/src/opnsense/scripts/interfaces/list_interfaces.php +++ b/src/opnsense/scripts/interfaces/list_interfaces.php @@ -28,7 +28,6 @@ */ require_once("interfaces.inc"); -require_once("interfaces.lib.inc"); $vfaces = [ '_stf',