d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ctrl: Allow command line arguments to override config file options.

Browse Source 
Closes #2010. Thanks to Willem Eradus.
This commit is contained in:
Roger A. Light 2021-01-15 12:19:20 +00:00
parent 300dc54dad
commit 26fbd0ec74
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -7,6 +7,9 @@ Broker:
- Add notes that libsystemd-dev or similar is needed if building with systemd
support. Closes #2019.
Apps:
- Allow command line arguments to override config file options in
mosquitto_ctrl. Closes #2010.
2.0.5 - 2021-01-11
==================

6
apps/mosquitto_ctrl/options.c
View File

@ -89,11 +89,11 @@ int ctrl_config_parse(struct mosq_config *cfg, int *argc, char **argv[])
init_config(cfg);
/* Deal with real argc/argv */
rc = client_config_line_proc(cfg, argc, argv);
rc = client_config_load(cfg);
if(rc) return rc;
rc = client_config_load(cfg);
/* Deal with real argc/argv */
rc = client_config_line_proc(cfg, argc, argv);
if(rc) return rc;
#ifdef WITH_TLS