d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve logging in dynsec addGroupClient command.

Browse Source 
Closes #2008. Thanks to Willem Eradus.
This commit is contained in:
Roger A. Light 2021-01-11 13:28:20 +00:00
parent ae3800ad66
commit 5927778ae5
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -16,6 +16,7 @@ Broker:
before a role that was attached to the group or client is deleted.
Closes #1998.
- Improve logging in dynsec addGroupRole command. Closes #2005.
- Improve logging in dynsec addGroupClient command. Closes #2008.
Client library:
- Improve documentation around the `_v5()` and non-v5 functions, e.g.

4
plugins/dynamic-security/groups.c
View File

@ -507,7 +507,7 @@ int dynsec_groups__add_client(const char *username, const char *groupname, int p
HASH_FIND(hh, group->clientlist, username, strlen(username), clientlist);
if(clientlist != NULL){
/* Client is already in the group */
return MOSQ_ERR_SUCCESS;
return MOSQ_ERR_ALREADY_EXISTS;
}
rc = dynsec_clientlist__add(&group->clientlist, client, priority);
@ -567,6 +567,8 @@ int dynsec_groups__process_add_client(cJSON *j_responses, struct mosquitto *cont
dynsec__command_reply(j_responses, context, "addGroupClient", "Client not found", correlation_data);
}else if(rc == ERR_GROUP_NOT_FOUND){
dynsec__command_reply(j_responses, context, "addGroupClient", "Group not found", correlation_data);
}else if(rc == MOSQ_ERR_ALREADY_EXISTS){
dynsec__command_reply(j_responses, context, "addGroupClient", "Client is already in this group", correlation_data);
}else{
dynsec__command_reply(j_responses, context, "addGroupClient", "Internal error", correlation_data);
}

2
www/posts/2021/01/version-2-0-5-released.md
View File

@ -26,6 +26,7 @@ Version 2.0.5 of Mosquitto has been released. This is a bugfix release.
before a role that was attached to the group or client is deleted.
Closes [#1998].
- Improve logging in dynsec addGroupRole command. Closes [#2005].
- Improve logging in dynsec addGroupClient command. Closes [#2008].
# Client library
- Improve documentation around the `_v5()` and non-v5 functions, e.g.
@ -52,3 +53,4 @@ Version 2.0.5 of Mosquitto has been released. This is a bugfix release.
[#1998]: https://github.com/eclipse/mosquitto/issues/1998
[#1999]: https://github.com/eclipse/mosquitto/issues/1999
[#2005]: https://github.com/eclipse/mosquitto/issues/2005
[#2008]: https://github.com/eclipse/mosquitto/issues/2008