mirror of
https://github.com/eclipse-mosquitto/mosquitto.git
synced 2026-09-22 08:04:23 +08:00
Fix global plugins not being loaded when used with per_listener_settings true.
This commit is contained in:
+1
-1
@@ -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;
|
||||
|
||||
+3
-4
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user