From 06307f9eb66ad5c0a9f9c85ed4e6a600eb62b804 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 1 Oct 2016 10:37:47 +0200
Subject: [PATCH] config: push plugins.inc to a vital spot to be included once
 only

---
 src/etc/inc/config.lib.inc | 9 ++++++++-
 src/etc/inc/services.inc   | 1 -
 src/etc/inc/system.inc     | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc
index 07f76bcc5..340b5a11b 100644
--- a/src/etc/inc/config.lib.inc
+++ b/src/etc/inc/config.lib.inc
@@ -55,6 +55,14 @@ require_once("legacy_bindings.inc");
 require_once('upgrade_config.inc');
 require_once("certs.inc");
 
+/*
+ * Hook up the plugin system which consists of several low-profile
+ * functions that can be called from within our backend code when
+ * they exist.  The magic here is that if the plugin system is not
+ * required it can be completely disabled by removing plugins.inc.
+ */
+include_once('plugins.inc');
+
 /* make a global alias table (for faster lookups) */
 function alias_make_table($config)
 {
@@ -178,7 +186,6 @@ function write_config($desc = '', $backup = true)
     }
 
     if (function_exists('plugins_interfaces')) {
-        /* only pull plugins if plugins.inc was included before */
         plugins_interfaces();
     }
 
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 684223767..778b3293f 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2660,7 +2660,6 @@ function services_get()
     );
 
     if (function_exists('plugins_services')) {
-        /* only pull plugins if plugins.inc was included before */
         foreach (plugins_services() as $service) {
             $services[] = $service;
         }
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 29f759f8f..41f502c5c 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -783,7 +783,6 @@ function system_syslogd_start()
         $syslogconfs = array();
 
         if (function_exists('plugins_syslog')) {
-            /* only pull plugins if plugins.inc was included before */
             foreach (plugins_syslog() as $plugin_name => $plugin_details) {
                 $syslogconfs[$plugin_name] = $plugin_details;
             }