From efa9d4ef98419f9acda691d005ba49b753b874e6 Mon Sep 17 00:00:00 2001
From: benschermel <ben@eqalpha.com>
Date: Tue, 23 Mar 2021 18:41:59 +0000
Subject: [PATCH] addressing comments from merge review

Former-commit-id: 955aa69ca16ca7230d5099ad16f6f825402b5dd5
---
 pkg/deb/deb-buildsource.sh | 2 +-
 src/config.cpp             | 2 +-
 src/replication.cpp        | 4 ++--
 src/server.cpp             | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/deb/deb-buildsource.sh b/pkg/deb/deb-buildsource.sh
index ed055a7b6..b1109642b 100755
--- a/pkg/deb/deb-buildsource.sh
+++ b/pkg/deb/deb-buildsource.sh
@@ -61,4 +61,4 @@ sudo pbuilder --build *.dsc  --logfile /mnt/pbuilderlog.log
 cp /var/cache/pbuilder/result/*$version*.deb ../deb_files_generated
 sudo pbuilder clean
 cd ../
-#rm -rf $pkg_name
+rm -rf $pkg_name
diff --git a/src/config.cpp b/src/config.cpp
index 9a608e6f8..99505d444 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -1855,7 +1855,7 @@ int rewriteConfig(char *path, int force_all) {
     rewriteConfigClientoutputbufferlimitOption(state);
     rewriteConfigYesNoOption(state,"active-replica",g_pserver->fActiveReplica,CONFIG_DEFAULT_ACTIVE_REPLICA);
     rewriteConfigStringOption(state, "version-override",KEYDB_SET_VERSION,KEYDB_REAL_VERSION);
-    rewriteConfigStringOption(state, "enable-pro", cserver.license_key, CONFIG_DEFAULT_LICENSE_KEY);
+    rewriteConfigStringOption(state, "enable-enterprise", cserver.license_key, CONFIG_DEFAULT_LICENSE_KEY);
     rewriteConfigOOMScoreAdjValuesOption(state);
 
     /* Rewrite Sentinel config if in Sentinel mode. */
diff --git a/src/replication.cpp b/src/replication.cpp
index 0589868cb..9f13dcda6 100644
--- a/src/replication.cpp
+++ b/src/replication.cpp
@@ -2747,8 +2747,8 @@ void syncWithMaster(connection *conn) {
         err = sendSynchronousCommand(mi, SYNC_CMD_READ,conn,NULL);
         if (err[0] == '-') {
             if (err[1] == 'E' && err[2] == 'R' && err[3] == 'R') {
-                // Replicating with non-pro
-                serverLog(LL_WARNING, "Replicating with non-pro server.");
+                // Replicating with non-enterprise
+                serverLog(LL_WARNING, "Replicating with non-enterprise server.");
             } else {
                 serverLog(LL_WARNING, "Recieved error from client: %s", err);
                 sdsfree(err);
diff --git a/src/server.cpp b/src/server.cpp
index d1700223c..70fb762c4 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -71,7 +71,7 @@
 
 int g_fTestMode = false;
 const char *motd_url = "http://api.keydb.dev/motd/motd_server_pro.txt";
-const char *motd_cache_file = "/.keydb-pro-server-motd";
+const char *motd_cache_file = "/.keydb-enterprise-server-motd";
 
 #ifdef __linux__
 #include <sys/mman.h>
@@ -5426,7 +5426,7 @@ sds genRedisInfoString(const char *section) {
         if (sections++) info = sdscat(info,"\r\n");
         info = sdscatprintf(info, 
             "# KeyDB\r\n"
-            "variant:pro\r\n"
+            "variant:enterprise\r\n"
             "license_status:%s\r\n"
             "mvcc_depth:%d\r\n",
             cserver.license_key ? "OK" : "Trial",