Cluster: slaveof not allowed in redis.conf as well.

This commit is contained in:
antirez 2013-03-05 12:58:22 +01:00
parent b7d085fc0d
commit 31ac376051

View File

@ -438,6 +438,12 @@ void loadServerConfigFromString(char *config) {
sdsfreesplitres(argv,argc); sdsfreesplitres(argv,argc);
} }
sdsfreesplitres(lines,totlines); sdsfreesplitres(lines,totlines);
/* Sanity checks. */
if (server.cluster_enabled && server.masterhost) {
err = "slaveof directive not allowed in cluster mode";
goto loaderr;
}
return; return;
loaderr: loaderr: