From 31ac376051c3b92c917d3e042fd94bd3b9b20ef4 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Tue, 5 Mar 2013 12:58:22 +0100
Subject: [PATCH] Cluster: slaveof not allowed in redis.conf as well.

---
 src/config.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/config.c b/src/config.c
index 9fa85599..8040adc2 100644
--- a/src/config.c
+++ b/src/config.c
@@ -438,6 +438,12 @@ void loadServerConfigFromString(char *config) {
         sdsfreesplitres(argv,argc);
     }
     sdsfreesplitres(lines,totlines);
+
+    /* Sanity checks. */
+    if (server.cluster_enabled && server.masterhost) {
+        err = "slaveof directive not allowed in cluster mode";
+        goto loaderr;
+    }
     return;
 
 loaderr: