Commit d5fe17dc authored by antirez's avatar antirez
Browse files

Merge branch 'unstable' of github.com:/antirez/redis into unstable

parents b82d3568 1aa9fa37
......@@ -580,7 +580,7 @@ int ACLCheckCommandPerm(client *c) {
for (int j = 0; j < numkeys; j++) {
listIter li;
listNode *ln;
listRewind(u->passwords,&li);
listRewind(u->patterns,&li);
/* Test this key against every pattern. */
int match = 0;
......@@ -595,9 +595,12 @@ int ACLCheckCommandPerm(client *c) {
break;
}
}
if (!match) return ACL_DENIED_KEY;
if (!match) {
getKeysFreeResult(keyidx);
return ACL_DENIED_KEY;
}
}
getKeysFreeResult(keyidx);
if (keyidx) getKeysFreeResult(keyidx);
}
/* If we survived all the above checks, the user can execute the
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment