Commit 416c6401 authored by antirez's avatar antirez
Browse files

ACL: change behavior of redefined user. Last line counts.

parent 775bf619
...@@ -978,12 +978,12 @@ int ACLLoadConfiguredUsers(void) { ...@@ -978,12 +978,12 @@ int ACLLoadConfiguredUsers(void) {
listRewind(UsersToLoad,&li); listRewind(UsersToLoad,&li);
while ((ln = listNext(&li)) != NULL) { while ((ln = listNext(&li)) != NULL) {
sds *aclrules = listNodeValue(ln); sds *aclrules = listNodeValue(ln);
user *u = ACLCreateUser(aclrules[0],sdslen(aclrules[0])); sds username = aclrules[0];
user *u = ACLCreateUser(username,sdslen(username));
if (!u) { if (!u) {
serverLog(LL_WARNING, u = ACLGetUserByName(username,sdslen(username));
"Error loading ACLs: user '%s' specified multiple times", serverAssert(u != NULL);
aclrules[0]); ACLSetUser(u,"reset",-1);
return C_ERR;
} }
/* Load every rule defined for this user. */ /* Load every rule defined for this user. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment