SERVER-40928 mongocryptd --help output list incorrect default port

2 files changed, 8 insertions, 5 deletions

diff --git a/src/mongo/db/server_options.cpp b/src/mongo/db/server_options.cpp
index e854a3ebb06..24330e5c0bc 100644
--- a/src/mongo/db/server_options.cpp
+++ b/src/mongo/db/server_options.cpp
@@ -42,7 +42,7 @@ namespace mongo {
 ServerGlobalParams serverGlobalParams;
 
 std::string ServerGlobalParams::getPortSettingHelpText() {
-    return str::stream() << "Specify port number - " << DefaultDBPort << " by default";
+    return str::stream() << "Specify port number - " << serverGlobalParams.port << " by default";
 }
 
 }  // namespace mongo
diff --git a/src/mongo/db/server_options.h b/src/mongo/db/server_options.h
index c8cc07b444e..14237da05e2 100644
--- a/src/mongo/db/server_options.h
+++ b/src/mongo/db/server_options.h
@@ -47,10 +47,13 @@ struct ServerGlobalParams {
     std::string cwd;         // cwd of when process started
 
     int port = DefaultDBPort;  // --port
-    enum { DefaultDBPort = 27017, ConfigServerPort = 27019, ShardServerPort = 27018 };
-    bool isDefaultPort() const {
-        return port == DefaultDBPort;
-    }
+    enum {
+        ConfigServerPort = 27019,
+        CryptDServerPort = 27020,
+        DefaultDBPort = 27017,
+        ShardServerPort = 27018,
+    };
+
     static std::string getPortSettingHelpText();
 
     std::vector<std::string> bind_ips;  // --bind_ip