fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Make PR #5872 more compatible with Redis coding style.

Browse Source
This commit is contained in:
antirez 2019-02-27 09:34:50 +01:00
parent 0dcb003887
commit f311a529be
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/acl.c
View File

@ -1394,12 +1394,11 @@ void aclCommand(client *c) {
char *sub = c->argv[1]->ptr; char *sub = c->argv[1]->ptr;
if (!strcasecmp(sub,"setuser") && c->argc >= 3) { if (!strcasecmp(sub,"setuser") && c->argc >= 3) {
sds username = c->argv[2]->ptr; sds username = c->argv[2]->ptr;
/* Create a temporary user to validate and stage all changes against before /* Create a temporary user to validate and stage all changes against
* applying to an existing user or creating a new user. If all arguments * before applying to an existing user or creating a new user. If all
* are valid the user parameters will all be applied together. If there are * arguments are valid the user parameters will all be applied together.
* any errors then none of the changes will be applied. */ * If there are any errors then none of the changes will be applied. */
user *tempu = ACLCreateUnlinkedUser(); user *tempu = ACLCreateUnlinkedUser();
user *u = ACLGetUserByName(username,sdslen(username)); user *u = ACLGetUserByName(username,sdslen(username));
if (u) ACLCopyUser(tempu, u); if (u) ACLCopyUser(tempu, u);
@ -1415,12 +1414,11 @@ void aclCommand(client *c) {
} }
} }
/* Overwrite the user with the temporary user we modified above. */
if (!u) u = ACLCreateUser(username,sdslen(username)); if (!u) u = ACLCreateUser(username,sdslen(username));
serverAssert(u != NULL); serverAssert(u != NULL);
ACLCopyUser(u, tempu); ACLCopyUser(u, tempu);
ACLFreeUser(tempu); ACLFreeUser(tempu);
addReply(c,shared.ok); addReply(c,shared.ok);
} else if (!strcasecmp(sub,"deluser") && c->argc >= 3) { } else if (!strcasecmp(sub,"deluser") && c->argc >= 3) {
int deleted = 0; int deleted = 0;