gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SENTINEL] reset sentinel-user/pass to NULL when user config with empty string (#8958)

Browse Source 
(cherry picked from commit ae6f58690b91010d003cdf5552d74b8e5b428d53)
This commit is contained in:
Wen Hui 2021-05-23 07:31:01 -04:00 committed by Oran Agra
parent f8938d868b
commit efb7a5c630
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sentinel.c
View File

@ -3175,11 +3175,13 @@ void sentinelConfigSetCommand(client *c) {
sentinel.announce_port = numval; sentinel.announce_port = numval;
} else if (!strcasecmp(o->ptr, "sentinel-user")) { } else if (!strcasecmp(o->ptr, "sentinel-user")) {
sdsfree(sentinel.sentinel_auth_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; drop_conns = 1;
} else if (!strcasecmp(o->ptr, "sentinel-pass")) { } else if (!strcasecmp(o->ptr, "sentinel-pass")) {
sdsfree(sentinel.sentinel_auth_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; drop_conns = 1;
} else { } else {
addReplyErrorFormat(c, "Invalid argument '%s' to SENTINEL CONFIG SET", addReplyErrorFormat(c, "Invalid argument '%s' to SENTINEL CONFIG SET",