From 31f448f35a7cd5bacd5dcc8c1dcc243fcf222d93 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Tue, 21 May 2019 23:56:22 +0100 Subject: [PATCH] Fix MQTT v5 clients not being able to specify a password without a username. Thanks to Erik Moqvist. Closes #1274. --- client/client_shared.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/client_shared.c b/client/client_shared.c index 69d2dc36ae..ede8baa1d9 100644 --- a/client/client_shared.c +++ b/client/client_shared.c @@ -1081,8 +1081,8 @@ int client_opts_set(struct mosquitto *mosq, struct mosq_config *cfg) } cfg->will_props = NULL; - if(cfg->username && mosquitto_username_pw_set(mosq, cfg->username, cfg->password)){ - err_printf(cfg, "Error: Problem setting username and password.\n"); + if((cfg->username || cfg->password) && mosquitto_username_pw_set(mosq, cfg->username, cfg->password)){ + err_printf(cfg, "Error: Problem setting username and/or password.\n"); mosquitto_lib_cleanup(); return 1; }