root
/
redis
mirror of https://github.com/redis/redis.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5858 from madolson/dev-unstable-acl-deluser 

Making deleting users better defined and update documentation
This commit is contained in:
Salvatore Sanfilippo 2019-02-22 10:27:37 +01:00 committed by GitHub
parent 3a7fd48e30 fdc4003d23
commit 21b8560e95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/acl.c
View File

@ -1372,7 +1372,7 @@ void ACLLoadUsersAtStartup(void) {
* ACL USERS * ACL USERS
* ACL CAT [<category>] * ACL CAT [<category>]
* ACL SETUSER <username> ... acl rules ... * ACL SETUSER <username> ... acl rules ...
* ACL DELUSER <username> * ACL DELUSER <username> [...]
* ACL GETUSER <username> * ACL GETUSER <username>
*/ */
void aclCommand(client *c) { void aclCommand(client *c) {
@ -1400,6 +1400,10 @@ void aclCommand(client *c) {
addReplyError(c,"The 'default' user cannot be removed"); addReplyError(c,"The 'default' user cannot be removed");
return; return;
} }
}
for (int j = 2; j < c->argc; j++) {
sds username = c->argv[j]->ptr;
user *u; user *u;
if (raxRemove(Users,(unsigned char*)username, if (raxRemove(Users,(unsigned char*)username,
sdslen(username), sdslen(username),
@ -1546,7 +1550,7 @@ void aclCommand(client *c) {
"USERS -- List all the registered usernames.", "USERS -- List all the registered usernames.",
"SETUSER <username> [attribs ...] -- Create or modify a user.", "SETUSER <username> [attribs ...] -- Create or modify a user.",
"GETUSER <username> -- Get the user details.", "GETUSER <username> -- Get the user details.",
"DELUSER <username> -- Delete a user.", "DELUSER <username> [...] -- Delete a list of users.",
"CAT -- List available categories.", "CAT -- List available categories.",
"CAT <category> -- List commands inside category.", "CAT <category> -- List commands inside category.",
"WHOAMI -- Return the current connection username.", "WHOAMI -- Return the current connection username.",