From b60465eb788ca0ac2bdaf5ae6df6f2401348f805 Mon Sep 17 00:00:00 2001 From: Michel Martens Date: Thu, 25 Apr 2013 11:06:10 -0300 Subject: [PATCH] Reset masterauth if an empty string is configured. --- src/config.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/config.c b/src/config.c index 227d30013c..2dcfa7cd7c 100644 --- a/src/config.c +++ b/src/config.c @@ -514,7 +514,11 @@ void configSetCommand(redisClient *c) { server.requirepass = ((char*)o->ptr)[0] ? zstrdup(o->ptr) : NULL; } else if (!strcasecmp(c->argv[2]->ptr,"masterauth")) { zfree(server.masterauth); - server.masterauth = zstrdup(o->ptr); + if (sdslen(o->ptr)) { + server.masterauth = zstrdup(o->ptr); + } else { + server.masterauth = NULL; + } } else if (!strcasecmp(c->argv[2]->ptr,"maxmemory")) { if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt;