From ae6f58690b91010d003cdf5552d74b8e5b428d53 Mon Sep 17 00:00:00 2001 From: Wen Hui Date: Sun, 23 May 2021 07:31:01 -0400 Subject: [PATCH] [SENTINEL] reset sentinel-user/pass to NULL when user config with empty string (#8958) --- src/sentinel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sentinel.c b/src/sentinel.c index bae0ad0ef..f7cb82615 100644 --- a/src/sentinel.c +++ b/src/sentinel.c @@ -3161,11 +3161,13 @@ void sentinelConfigSetCommand(client *c) { sentinel.announce_port = numval; } else if (!strcasecmp(o->ptr, "sentinel-user")) { sdsfree(sentinel.sentinel_auth_user); - sentinel.sentinel_auth_user = sdsnew(val->ptr); + sentinel.sentinel_auth_user = sdslen(val->ptr) == 0 ? + sdsdup(val->ptr) : NULL; drop_conns = 1; } else if (!strcasecmp(o->ptr, "sentinel-pass")) { sdsfree(sentinel.sentinel_auth_pass); - sentinel.sentinel_auth_pass = sdsnew(val->ptr); + sentinel.sentinel_auth_pass = sdslen(val->ptr) == 0 ? + sdsdup(val->ptr) : NULL; drop_conns = 1; } else { addReplyErrorFormat(c, "Invalid argument '%s' to SENTINEL CONFIG SET",