Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
06307f9e
Commit
06307f9e
authored
Oct 01, 2016
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
config: push plugins.inc to a vital spot to be included once only
parent
0c3caa64
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
config.lib.inc
src/etc/inc/config.lib.inc
+8
-1
services.inc
src/etc/inc/services.inc
+0
-1
system.inc
src/etc/inc/system.inc
+0
-1
No files found.
src/etc/inc/config.lib.inc
View file @
06307f9e
...
@@ -55,6 +55,14 @@ require_once("legacy_bindings.inc");
...
@@ -55,6 +55,14 @@ require_once("legacy_bindings.inc");
require_once
(
'upgrade_config.inc'
);
require_once
(
'upgrade_config.inc'
);
require_once
(
"certs.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) */
/* make a global alias table (for faster lookups) */
function
alias_make_table
(
$config
)
function
alias_make_table
(
$config
)
{
{
...
@@ -178,7 +186,6 @@ function write_config($desc = '', $backup = true)
...
@@ -178,7 +186,6 @@ function write_config($desc = '', $backup = true)
}
}
if
(
function_exists
(
'plugins_interfaces'
))
{
if
(
function_exists
(
'plugins_interfaces'
))
{
/* only pull plugins if plugins.inc was included before */
plugins_interfaces
();
plugins_interfaces
();
}
}
...
...
src/etc/inc/services.inc
View file @
06307f9e
...
@@ -2660,7 +2660,6 @@ function services_get()
...
@@ -2660,7 +2660,6 @@ function services_get()
);
);
if
(
function_exists
(
'plugins_services'
))
{
if
(
function_exists
(
'plugins_services'
))
{
/* only pull plugins if plugins.inc was included before */
foreach
(
plugins_services
()
as
$service
)
{
foreach
(
plugins_services
()
as
$service
)
{
$services
[]
=
$service
;
$services
[]
=
$service
;
}
}
...
...
src/etc/inc/system.inc
View file @
06307f9e
...
@@ -783,7 +783,6 @@ function system_syslogd_start()
...
@@ -783,7 +783,6 @@ function system_syslogd_start()
$syslogconfs
=
array
();
$syslogconfs
=
array
();
if
(
function_exists
(
'plugins_syslog'
))
{
if
(
function_exists
(
'plugins_syslog'
))
{
/* only pull plugins if plugins.inc was included before */
foreach
(
plugins_syslog
()
as
$plugin_name
=>
$plugin_details
)
{
foreach
(
plugins_syslog
()
as
$plugin_name
=>
$plugin_details
)
{
$syslogconfs
[
$plugin_name
]
=
$plugin_details
;
$syslogconfs
[
$plugin_name
]
=
$plugin_details
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment