From 682e6c0401cc9151d61cf871db6f5714d0dfb01d Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Fri, 4 Feb 2022 15:36:38 +0000 Subject: [PATCH] Fix global plugins not being loaded when used with per_listener_settings true. --- src/mosquitto.c | 2 +- src/plugin_init.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mosquitto.c b/src/mosquitto.c index cdb467c0..74d1f058 100644 --- a/src/mosquitto.c +++ b/src/mosquitto.c @@ -259,10 +259,10 @@ int main(int argc, char *argv[]) net__broker_init(); + db.config = &config; config__init(&config); rc = config__parse_args(&config, argc, argv); if(rc != MOSQ_ERR_SUCCESS) return rc; - db.config = &config; rc = keepalive__init(); if(rc != MOSQ_ERR_SUCCESS) return rc; diff --git a/src/plugin_init.c b/src/plugin_init.c index 404ef546..3ef43fdf 100644 --- a/src/plugin_init.c +++ b/src/plugin_init.c @@ -132,10 +132,8 @@ int mosquitto_security_module_init(void) rc = security__module_init_single(&db.config->listeners[i], &db.config->listeners[i].security_options); if(rc) return rc; } - }else{ - rc = security__module_init_single(NULL, &db.config->security_options); } - return rc; + return security__module_init_single(NULL, &db.config->security_options); } @@ -205,5 +203,6 @@ int mosquitto_security_init(bool reload) if(rc != MOSQ_ERR_SUCCESS) return rc; } } - return mosquitto_security_init_default(reload); + rc = mosquitto_security_init_default(reload); + return rc; }