diff --git a/apps/mosquitto_ctrl/dynsec_role.c b/apps/mosquitto_ctrl/dynsec_role.c index 2871f052..ea930854 100644 --- a/apps/mosquitto_ctrl/dynsec_role.c +++ b/apps/mosquitto_ctrl/dynsec_role.c @@ -131,8 +131,10 @@ int dynsec_role__add_acl(int argc, char *argv[], cJSON *j_command) if(strcasecmp(acltype, "publishClientSend") && strcasecmp(acltype, "publishClientReceive") - && strcasecmp(acltype, "subscribe") - && strcasecmp(acltype, "unsubscribe")){ + && strcasecmp(acltype, "subscribeLiteral") + && strcasecmp(acltype, "subscribePattern") + && strcasecmp(acltype, "unsubscribeLiteral") + && strcasecmp(acltype, "unsubscribePattern")){ return MOSQ_ERR_INVAL; } @@ -144,7 +146,7 @@ int dynsec_role__add_acl(int argc, char *argv[], cJSON *j_command) return MOSQ_ERR_INVAL; } - if(cJSON_AddStringToObject(j_command, "command", "addACLToRole") == NULL + if(cJSON_AddStringToObject(j_command, "command", "addRoleACL") == NULL || cJSON_AddStringToObject(j_command, "rolename", rolename) == NULL || cJSON_AddStringToObject(j_command, "acltype", acltype) == NULL || cJSON_AddStringToObject(j_command, "topic", topic) == NULL @@ -178,7 +180,7 @@ int dynsec_role__remove_acl(int argc, char *argv[], cJSON *j_command) return MOSQ_ERR_INVAL; } - if(cJSON_AddStringToObject(j_command, "command", "removeACLFromRole") == NULL + if(cJSON_AddStringToObject(j_command, "command", "removeRoleACL") == NULL || cJSON_AddStringToObject(j_command, "rolename", rolename) == NULL || cJSON_AddStringToObject(j_command, "acltype", acltype) == NULL || cJSON_AddStringToObject(j_command, "topic", topic) == NULL