mirror of
https://github.com/fluencelabs/redis
synced 2025-04-01 23:31:03 +00:00
Merge branch 'unstable' of github.com:/antirez/redis into unstable
This commit is contained in:
commit
d5fe17dc11
@ -580,7 +580,7 @@ int ACLCheckCommandPerm(client *c) {
|
|||||||
for (int j = 0; j < numkeys; j++) {
|
for (int j = 0; j < numkeys; j++) {
|
||||||
listIter li;
|
listIter li;
|
||||||
listNode *ln;
|
listNode *ln;
|
||||||
listRewind(u->passwords,&li);
|
listRewind(u->patterns,&li);
|
||||||
|
|
||||||
/* Test this key against every pattern. */
|
/* Test this key against every pattern. */
|
||||||
int match = 0;
|
int match = 0;
|
||||||
@ -595,9 +595,12 @@ int ACLCheckCommandPerm(client *c) {
|
|||||||
break;
|
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
|
/* If we survived all the above checks, the user can execute the
|
||||||
|
Loading…
x
Reference in New Issue
Block a user