Skip to content
Permalink
Browse files Browse the repository at this point in the history
Fix acl_file being ignore for default listener if with per_listener_s…
…ettings

Close #1073. Thanks to Jef Driesen.

Bug: #1073
  • Loading branch information
ralight committed Dec 9, 2018
1 parent 1a6f8d3 commit 9097577
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ChangeLog.txt
@@ -1,6 +1,11 @@
1.5.5 - 201812xx
================

Security:
- If `per_listener_settings` is set to true, then the `acl_file` setting was
ignored for the "default listener" only. This has been fixed. This does not
affect any listeners defined with the `listener` option. Closes #1073.

Broker:
- Add `socket_domain` option to allow listeners to disable IPv6 support.
This is required to work around a problem in libwebsockets that means
Expand Down
1 change: 1 addition & 0 deletions src/conf.c
Expand Up @@ -497,6 +497,7 @@ int config__parse_args(struct mosquitto_db *db, struct mosquitto__config *config
config->listeners[config->listener_count-1].use_identity_as_username = config->default_listener.use_identity_as_username;
config->listeners[config->listener_count-1].use_subject_as_username = config->default_listener.use_subject_as_username;
#endif
config->listeners[config->listener_count-1].security_options.acl_file = config->default_listener.security_options.acl_file;
config->listeners[config->listener_count-1].security_options.password_file = config->default_listener.security_options.password_file;
config->listeners[config->listener_count-1].security_options.psk_file = config->default_listener.security_options.psk_file;
config->listeners[config->listener_count-1].security_options.auth_plugin_configs = config->default_listener.security_options.auth_plugin_configs;
Expand Down

0 comments on commit 9097577

Please sign in to comment.