From ef3e52d40b0ce09a6a5a7032571ed340f208585c Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 16 May 2019 14:03:39 +0100 Subject: [PATCH] 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. --- ChangeLog.txt | 2 ++ src/conf.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 1910d056..9dbc0e3d 100644 --- 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 index 4fe05cf5..53c622cf 100644 --- 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;