Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 7 insertions, 0 deletions

diff --git a/src/mongo/s/mongos_options.cpp b/src/mongo/s/mongos_options.cpp
index 8b995415368..d333d1f7fc2 100644
--- a/src/mongo/s/mongos_options.cpp
+++ b/src/mongo/s/mongos_options.cpp
@@ -115,6 +115,13 @@ Status storeMongosOptions(const moe::Environment& params) {
         return ret;
     }
 
+    if (params.count("net.port")) {
+        int port = params["net.port"].as<int>();
+        if (port <= 0 || port > 65535) {
+            return Status(ErrorCodes::BadValue, "error: port number must be between 1 and 65535");
+        }
+    }
+
     if (params.count("security.javascriptEnabled")) {
         mongosGlobalParams.scriptingEnabled = params["security.javascriptEnabled"].as<bool>();
     }