Fix global plugins not being loaded when used with per_listener_settings true.

This commit is contained in:
Roger A. Light
2022-02-04 15:36:38 +00:00
parent 6b32cf61b2
commit 682e6c0401
2 changed files with 4 additions and 5 deletions
+1 -1
View File
@@ -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
View File
@@ -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;
}