gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACL: ACLLoadFromFile(), restore DefaultUser global.

Browse Source
This commit is contained in:
antirez 2019-02-07 17:00:35 +01:00
parent 6a7545e4d4
commit d26c9b5307
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/acl.c
View File

@ -1122,6 +1122,7 @@ sds ACLLoadFromFile(const char *filename) {
* so if there are errors loading the ACL file we can rollback to the * so if there are errors loading the ACL file we can rollback to the
* old version. */ * old version. */
rax *old_users = Users; rax *old_users = Users;
user *old_default_user = DefaultUser;
Users = raxNew(); Users = raxNew();
ACLInitDefaultUser(); ACLInitDefaultUser();
@ -1198,6 +1199,7 @@ sds ACLLoadFromFile(const char *filename) {
ACLFreeUser(fakeuser); ACLFreeUser(fakeuser);
sdsfreesplitres(lines,totlines); sdsfreesplitres(lines,totlines);
DefaultUser = old_default_user; /* This pointer must never change. */
/* Check if we found errors and react accordingly. */ /* Check if we found errors and react accordingly. */
if (sdslen(errors) == 0) { if (sdslen(errors) == 0) {