summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2018-06-22 15:48:33 +0200
committerGitHub <noreply@github.com>2018-06-22 15:48:33 +0200
commitcf7fcdbe4ea9496e4ed6385e75a82bf14ef6a0e5 (patch)
tree5e20c89def4009ed3d20f9f1c105e5904e28f1fa
parent70b7fa2c52648e4dec9e0e251163bd1aa413a90c (diff)
parent968cb2669346ebcb20016ac16923dcd31e31ad2f (diff)
downloadredis-cf7fcdbe4ea9496e4ed6385e75a82bf14ef6a0e5.tar.gz
Merge pull request #4634 from soloestoy/special-auth
config: handle special configuration "" for auth
-rw-r--r--src/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c
index 5bc05d0aa..c7fc11556 100644
--- a/src/config.c
+++ b/src/config.c
@@ -390,7 +390,7 @@ void loadServerConfigFromString(char *config) {
}
} else if (!strcasecmp(argv[0],"masterauth") && argc == 2) {
zfree(server.masterauth);
- server.masterauth = zstrdup(argv[1]);
+ server.masterauth = argv[1][0] ? zstrdup(argv[1]) : NULL;
} else if (!strcasecmp(argv[0],"slave-serve-stale-data") && argc == 2) {
if ((server.repl_serve_stale_data = yesnotoi(argv[1])) == -1) {
err = "argument must be 'yes' or 'no'"; goto loaderr;
@@ -503,7 +503,7 @@ void loadServerConfigFromString(char *config) {
err = "Password is longer than CONFIG_AUTHPASS_MAX_LEN";
goto loaderr;
}
- server.requirepass = zstrdup(argv[1]);
+ server.requirepass = argv[1][0] ? zstrdup(argv[1]) : NULL;
} else if (!strcasecmp(argv[0],"pidfile") && argc == 2) {
zfree(server.pidfile);
server.pidfile = zstrdup(argv[1]);