From f771c0a7c88b29f78e803055e39884518862abdd Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Sat, 11 Jul 2020 22:09:27 +0000
Subject: [PATCH] Fix failure to replicate with non-pro server when license key
 is set

Former-commit-id: a69beef7d92223c8dcebb9c39ca2409183571e57
---
 src/replication.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/replication.cpp b/src/replication.cpp
index 7ead1e7d7..477fe6e10 100644
--- a/src/replication.cpp
+++ b/src/replication.cpp
@@ -2720,9 +2720,17 @@ void syncWithMaster(connection *conn) {
     {
         err = sendSynchronousCommand(mi, SYNC_CMD_READ,conn,NULL);
         if (err[0] == '-') {
-            serverLog(LL_WARNING, "Recieved error from client: %s", err);
-            sdsfree(err);
-            goto error;
+            if (err[1] == 'E' && err[2] == 'R' && err[3] == 'R') {
+                // Replicating with non-pro
+                serverLog(LL_WARNING, "Replicating with non-pro server.");
+                mi->repl_state = REPL_STATE_SEND_PORT;
+                sdsfree(err);
+                return;
+            } else {
+                serverLog(LL_WARNING, "Recieved error from client: %s", err);
+                sdsfree(err);
+                goto error;
+            }
         }
         sdsfree(err);
         mi->repl_state = REPL_STATE_SEND_PORT;