From 2fa0cfe987f1a4fe6b9f5f4367b630c5250a4f09 Mon Sep 17 00:00:00 2001
From: Malavan Sotheeswaran <msotheeswaran@snapchat.com>
Date: Tue, 30 May 2023 13:25:30 -0700
Subject: [PATCH] only an issue if enabled

---
 src/config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index fc385242e..78cdb3877 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -749,7 +749,7 @@ void loadServerConfigFromString(char *config) {
                 g_pserver->fActiveReplica = CONFIG_DEFAULT_ACTIVE_REPLICA;
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
-            if (listLength(g_pserver->masters)) {
+            if (listLength(g_pserver->masters) && g_pserver->fActiveReplica) {
                 err = "must not set replica-of config before active-replica config"; goto loaderr;
             }
         } else if (!strcasecmp(argv[0], "multi-master") && argc == 2) {
@@ -758,7 +758,7 @@ void loadServerConfigFromString(char *config) {
                 g_pserver->enable_multimaster = CONFIG_DEFAULT_ENABLE_MULTIMASTER;
                 err = "argument must be 'yes' or 'no'"; goto loaderr;
             }
-            if (listLength(g_pserver->masters)) {
+            if (listLength(g_pserver->masters) && g_pserver->enable_multimaster) {
                 err = "must not set replica-of config before multi-master config"; goto loaderr;
             }
         } else if (!strcasecmp(argv[0], "tls-allowlist")) {