Fix default max_topic_alias listener config not being used.

This was not being copied to the in-use listener when compiled without TLS support.
eclipse · May 16, 2019 · ef3e52d · ef3e52d
1 parent 41cb9bf
commit ef3e52d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -3,6 +3,8 @@
 
 Broker:
 - Fix detection of incoming v3.1/v3.1.1 bridges. Closes #1263.
+- Fix default max_topic_alias listener config not being copied to the in-use
+ listener when compiled without TLS support.
 
 Clients:
 - Fix -L url parsing when `/topic` part is missing.

diff --git a/src/conf.c b/src/conf.c
@@ -504,12 +504,12 @@ int config__parse_args(struct mosquitto_db *db, struct mosquitto__config *config
  config->listeners[config->listener_count-1].client_count = 0;
  config->listeners[config->listener_count-1].use_username_as_clientid = config->default_listener.use_username_as_clientid;
  config->listeners[config->listener_count-1].maximum_qos = config->default_listener.maximum_qos;
+ config->listeners[config->listener_count-1].max_topic_alias = config->default_listener.max_topic_alias;
 #ifdef WITH_TLS
  config->listeners[config->listener_count-1].tls_version = config->default_listener.tls_version;
  config->listeners[config->listener_count-1].tls_engine = config->default_listener.tls_engine;
  config->listeners[config->listener_count-1].tls_keyform = config->default_listener.tls_keyform;
  config->listeners[config->listener_count-1].tls_engine_kpass_sha1 = config->default_listener.tls_engine_kpass_sha1;
- config->listeners[config->listener_count-1].max_topic_alias = config->default_listener.max_topic_alias;
  config->listeners[config->listener_count-1].cafile = config->default_listener.cafile;
  config->listeners[config->listener_count-1].capath = config->default_listener.capath;
  config->listeners[config->listener_count-1].certfile = config->default_listener.certfile;