From b7db4316fd380e3da1f5f761cfe2fefa5aefffa3 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 24 Jul 2023 08:37:52 +0200 Subject: [PATCH] src: legacy_bindings.inc already included by config.inc client_connect.php also includes it but not config.inc. Try to leave it at that to not pollute it unnecessarily. The other scripts might be able to do it as well this way but don't fix something that is not broken either. --- .../scripts/OPNsense/CaptivePortal/generate_certs.php | 5 ++--- src/opnsense/scripts/proxy/generate_cert.php | 4 ++-- src/opnsense/scripts/syslog/generate_certs | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/generate_certs.php b/src/opnsense/scripts/OPNsense/CaptivePortal/generate_certs.php index 442a3e2a0..7b7e707e8 100755 --- a/src/opnsense/scripts/OPNsense/CaptivePortal/generate_certs.php +++ b/src/opnsense/scripts/OPNsense/CaptivePortal/generate_certs.php @@ -27,11 +27,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -// use legacy code to generate certs and ca's -// eventually we need to replace this. +/* XXX use legacy code to generate certs and CAs */ + require_once("config.inc"); require_once("certs.inc"); -require_once("legacy_bindings.inc"); use OPNsense\Core\Config; diff --git a/src/opnsense/scripts/proxy/generate_cert.php b/src/opnsense/scripts/proxy/generate_cert.php index aa5a591f0..b2df4aabf 100755 --- a/src/opnsense/scripts/proxy/generate_cert.php +++ b/src/opnsense/scripts/proxy/generate_cert.php @@ -27,10 +27,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -// use legacy code to generate certs and ca's +/* XXX use legacy code to generate certs and CAs */ + require_once("config.inc"); require_once("certs.inc"); -require_once("legacy_bindings.inc"); use OPNsense\Core\Config; diff --git a/src/opnsense/scripts/syslog/generate_certs b/src/opnsense/scripts/syslog/generate_certs index a17159787..fa86a9e7d 100755 --- a/src/opnsense/scripts/syslog/generate_certs +++ b/src/opnsense/scripts/syslog/generate_certs @@ -27,10 +27,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +/* XXX use legacy code to generate certs and CAs */ + require_once("config.inc"); require_once("certs.inc"); -require_once("legacy_bindings.inc"); - $store = new OPNsense\Trust\Store(); $instances = [];