From ac6e49de4884eb1c2508179b903b0dfadde0f0b9 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Fri, 18 Jan 2019 11:26:29 +0100
Subject: [PATCH] ACL: implement resetpass directive and adjust test.
---
src/acl.c | 3 +++
tests/unit/dump.tcl | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/acl.c b/src/acl.c
index aeda9f2f..fc1edd87 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -190,6 +190,9 @@ int ACLSetUser(user *u, const char *op, ssize_t oplen) {
} else if (!strcasecmp(op,"nopass")) {
u->flags |= USER_FLAG_NOPASS;
listEmpty(u->passwords);
+ } else if (!strcasecmp(op,"resetpass")) {
+ u->flags &= ~USER_FLAG_NOPASS;
+ listEmpty(u->passwords);
} else if (op[0] == '>') {
sds newpass = sdsnewlen(op+1,oplen-1);
listNode *ln = listSearchKey(u->passwords,newpass);
diff --git a/tests/unit/dump.tcl b/tests/unit/dump.tcl
index 09768b80..062d803b 100644
--- a/tests/unit/dump.tcl
+++ b/tests/unit/dump.tcl
@@ -362,7 +362,7 @@ start_server {tags {"dump"}} {
r -1 lpush list a b c d
$second config set requirepass foobar2
catch {r -1 migrate $second_host $second_port list 9 5000 AUTH foobar} err
- assert_match {*invalid password*} $err
+ assert_match {*WRONGPASS*} $err
}
}
}