mirror of
https://github.com/fluencelabs/redis
synced 2025-04-29 12:32:14 +00:00
ACL: fix a few ACLLoadFromFile() errors and finish ACLFreeUsersSet().
This commit is contained in:
parent
1790be1496
commit
7a86ba22e0
@ -249,7 +249,7 @@ void ACLCopyUser(user *dst, user *src) {
|
|||||||
/* Free all the users registered in the radix tree 'users' and free the
|
/* Free all the users registered in the radix tree 'users' and free the
|
||||||
* radix tree itself. */
|
* radix tree itself. */
|
||||||
void ACLFreeUsersSet(rax *users) {
|
void ACLFreeUsersSet(rax *users) {
|
||||||
/* TODO */
|
raxFreeWithCallback(users,(void(*)(void*))ACLFreeUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Given a command ID, this function set by reference 'word' and 'bit'
|
/* Given a command ID, this function set by reference 'word' and 'bit'
|
||||||
@ -1208,7 +1208,8 @@ sds ACLLoadFromFile(const char *filename) {
|
|||||||
ACLCopyUser(DefaultUser,new);
|
ACLCopyUser(DefaultUser,new);
|
||||||
ACLFreeUser(new);
|
ACLFreeUser(new);
|
||||||
raxInsert(Users,(unsigned char*)"default",7,DefaultUser,NULL);
|
raxInsert(Users,(unsigned char*)"default",7,DefaultUser,NULL);
|
||||||
|
raxRemove(old_users,(unsigned char*)"default",7,NULL);
|
||||||
|
ACLFreeUsersSet(old_users);
|
||||||
sdsfree(errors);
|
sdsfree(errors);
|
||||||
return NULL;
|
return NULL;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user