diff options
Diffstat (limited to 'src/multi.c')
| -rw-r--r-- | src/multi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/multi.c b/src/multi.c index 4abdb7499..902c919c7 100644 --- a/src/multi.c +++ b/src/multi.c @@ -204,9 +204,7 @@ void execCommand(client *c) { /* ACL permissions are also checked at the time of execution in case * they were changed after the commands were queued. */ int acl_errpos; - int acl_retval = ACLCheckCommandPerm(c,&acl_errpos); - if (acl_retval == ACL_OK && c->cmd->proc == publishCommand) - acl_retval = ACLCheckPubsubPerm(c,1,1,0,&acl_errpos); + int acl_retval = ACLCheckAllPerm(c,&acl_errpos); if (acl_retval != ACL_OK) { char *reason; switch (acl_retval) { @@ -217,7 +215,8 @@ void execCommand(client *c) { reason = "no permission to touch the specified keys"; break; case ACL_DENIED_CHANNEL: - reason = "no permission to publish to the specified channel"; + reason = "no permission to access one of the channels used " + "as arguments"; break; default: reason = "no permission"; |