diff options
| author | Wen Hui <wen.hui.ware@gmail.com> | 2021-05-23 07:31:01 -0400 |
|---|---|---|
| committer | Oran Agra <oran@redislabs.com> | 2021-06-01 17:03:36 +0300 |
| commit | ed995ffa035311906000ffa44c53110ad2b780fe (patch) | |
| tree | 4ed5ede33654c0e90497523a7361286e1254aad5 | |
| parent | 875a1f07d821dc5abe737b064018a27bbc7175d2 (diff) | |
| download | redis-ed995ffa035311906000ffa44c53110ad2b780fe.tar.gz | |
[SENTINEL] reset sentinel-user/pass to NULL when user config with empty string (#8958)
(cherry picked from commit ae6f58690b91010d003cdf5552d74b8e5b428d53)
| -rw-r--r-- | src/sentinel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sentinel.c b/src/sentinel.c index 2d81d98ac..7b387ef83 100644 --- a/src/sentinel.c +++ b/src/sentinel.c @@ -3175,11 +3175,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", |