Revert "SERVER-28229: Bind to localhost by default"

This reverts commit d6b244fce44e6729485b1521346db6e372f6b901.

2 files changed, 13 insertions, 37 deletions

diff --git a/src/mongo/db/server_options_helpers.cpp b/src/mongo/db/server_options_helpers.cpp
index 05ee1033bfa..37412636992 100644
--- a/src/mongo/db/server_options_helpers.cpp
+++ b/src/mongo/db/server_options_helpers.cpp
@@ -184,17 +184,11 @@ Status addGeneralServerOptions(moe::OptionSection* options) {
 
     options->addOptionChaining("net.port", "port", moe::Int, portInfoBuilder.str().c_str());
 
-    options
-        ->addOptionChaining(
-            "net.bindIp",
-            "bind_ip",
-            moe::String,
-            "comma separated list of ip addresses to listen on - localhost by default")
-        .incompatibleWith("bind_ip_all");
-
-    options
-        ->addOptionChaining("net.bindIpAll", "bind_ip_all", moe::Switch, "bind to all ip addresses")
-        .incompatibleWith("bind_ip");
+    options->addOptionChaining(
+        "net.bindIp",
+        "bind_ip",
+        moe::String,
+        "comma separated list of ip addresses to listen on - all local ips by default");
 
     options->addOptionChaining(
         "net.ipv6", "ipv6", moe::Switch, "enable IPv6 support (disabled by default)");
@@ -832,6 +826,10 @@ Status storeServerOptions(const moe::Environment& params) {
         serverGlobalParams.port = params["net.port"].as<int>();
     }
 
+    if (params.count("net.bindIp")) {
+        serverGlobalParams.bind_ip = params["net.bindIp"].as<std::string>();
+    }
+
     if (params.count("net.ipv6") && params["net.ipv6"].as<bool>() == true) {
         enableIPv6();
     }
@@ -885,18 +883,11 @@ Status storeServerOptions(const moe::Environment& params) {
         serverGlobalParams.objcheck = params["net.wireObjectCheck"].as<bool>();
     }
 
-    if (params.count("net.bindIpAll") && params["net.bindIpAll"].as<bool>()) {
-        // Bind to all IP addresses
-        serverGlobalParams.bind_ip = "0.0.0.0";
-        if (params.count("net.ipv6") && params["net.ipv6"].as<bool>()) {
-            serverGlobalParams.bind_ip += ",::";
+    if (params.count("net.bindIp")) {
+        // passing in wildcard is the same as default behavior; remove for SERVER-3350
+        if (serverGlobalParams.bind_ip == "0.0.0.0") {
+            serverGlobalParams.bind_ip = "";
         }
-    } else if (params.count("net.bindIp")) {
-        // Bind to enumerated IP addresses
-        serverGlobalParams.bind_ip = params["net.bindIp"].as<std::string>();
-    } else {
-        // Bind to localhost
-        serverGlobalParams.bind_ip = "";
     }
 
 #ifndef _WIN32
diff --git a/src/mongo/db/startup_warnings_common.cpp b/src/mongo/db/startup_warnings_common.cpp
index 0480dc41494..9c444410b51 100644
--- a/src/mongo/db/startup_warnings_common.cpp
+++ b/src/mongo/db/startup_warnings_common.cpp
@@ -125,21 +125,6 @@ void logCommonStartupWarnings(const ServerGlobalParams& serverParams) {
     }
 #endif
 
-    if (serverParams.bind_ip.empty()) {
-        log() << startupWarningsLog;
-        log() << "** ATTENTION: The server is bound to localhost." << startupWarningsLog;
-        log() << "**          Remote systems will be unable to connect to this server. "
-              << startupWarningsLog;
-        log() << "**          Start the server with --bind_ip <address> to specify which IP "
-                 "addresses it"
-              << startupWarningsLog;
-        log() << "**          should serve responses from, or with --bind_ip_all to bind to all "
-                 "interfaces."
-              << startupWarningsLog;
-        warned = true;
-    }
-
-
     if (warned) {
         log() << startupWarningsLog;
     }