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

Closes #2010. Thanks to Willem Eradus.

ChangeLog.txt

@@ -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
 ==================

apps/mosquitto_ctrl/options.c

@@ -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_load(cfg);
-	rc = client_config_line_proc(cfg, argc, argv);
 	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