From 416c640156626978843e03cf573925a75d01c67a Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Tue, 5 Feb 2019 10:52:05 +0100
Subject: [PATCH] ACL: change behavior of redefined user. Last line counts.

---
 src/acl.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/acl.c b/src/acl.c
index 8211dcea..db2f291c 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -978,12 +978,12 @@ int ACLLoadConfiguredUsers(void) {
     listRewind(UsersToLoad,&li);
     while ((ln = listNext(&li)) != NULL) {
         sds *aclrules = listNodeValue(ln);
-        user *u = ACLCreateUser(aclrules[0],sdslen(aclrules[0]));
+        sds username = aclrules[0];
+        user *u = ACLCreateUser(username,sdslen(username));
         if (!u) {
-            serverLog(LL_WARNING,
-                      "Error loading ACLs: user '%s' specified multiple times",
-                      aclrules[0]);
-            return C_ERR;
+            u = ACLGetUserByName(username,sdslen(username));
+            serverAssert(u != NULL);
+            ACLSetUser(u,"reset",-1);
         }
 
         /* Load every rule defined for this user. */