From 88456c655f6a6deebf1a4c2bba13ec1ba2923f07 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 21 Jun 2018 16:17:34 +0200 Subject: [PATCH] Move check whether context is a bridge in front of check whether a listener exists for context. New test now passes. Signed-off-by: Wolfgang Hottgenroth --- src/security_default.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security_default.c b/src/security_default.c index ea6fd21c..d78ada48 100644 --- a/src/security_default.c +++ b/src/security_default.c @@ -311,6 +311,7 @@ int mosquitto_acl_check_default(struct mosquitto_db *db, struct mosquitto *conte struct mosquitto__security_options *security_opts = NULL; if(!db || !context || !topic) return MOSQ_ERR_INVAL; + if(context->bridge) return MOSQ_ERR_SUCCESS; if(db->config->per_listener_settings){ if(!context->listener) return MOSQ_ERR_ACL_DENIED; @@ -322,7 +323,6 @@ int mosquitto_acl_check_default(struct mosquitto_db *db, struct mosquitto *conte return MOSQ_ERR_PLUGIN_DEFER; } - if(context->bridge) return MOSQ_ERR_SUCCESS; if(access == MOSQ_ACL_SUBSCRIBE) return MOSQ_ERR_SUCCESS; /* FIXME - implement ACL subscription strings. */ if(!context->acl_list && !security_opts->acl_patterns) return MOSQ_ERR_ACL_DENIED;