SERVER-13379 Canonicalize nounixsocket as net.unixDomainSocket.enabled

1 files changed, 13 insertions, 6 deletions

diff --git a/src/mongo/db/server_options_helpers.cpp b/src/mongo/db/server_options_helpers.cpp
index 05d508f977f..c3285616a26 100644
--- a/src/mongo/db/server_options_helpers.cpp
+++ b/src/mongo/db/server_options_helpers.cpp
@@ -440,6 +440,19 @@ namespace {
             }
         }
 
+        // "net.unixDomainSocket.enabled" comes from the config file, so override it if
+        // "nounixsocket" is set since that comes from the command line.
+        if (params->count("nounixsocket")) {
+            Status ret = params->set("net.unixDomainSocket.enabled", moe::Value(false));
+            if (!ret.isOK()) {
+                return ret;
+            }
+            ret = params->remove("nounixsocket");
+            if (!ret.isOK()) {
+                return ret;
+            }
+        }
+
         return Status::OK();
     }
 
@@ -599,16 +612,10 @@ namespace {
             serverGlobalParams.socket = params["net.unixDomainSocket.pathPrefix"].as<string>();
         }
 
-        // --nounixsocket is checked after this since net.unixDomainSocket.enabled is from the
-        // config file and the command line should override the config file
         if (params.count("net.unixDomainSocket.enabled")) {
             serverGlobalParams.noUnixSocket = !params["net.unixDomainSocket.enabled"].as<bool>();
         }
 
-        if (params.count("nounixsocket")) {
-            serverGlobalParams.noUnixSocket = true;
-        }
-
         if (params.count("processManagement.fork") && !params.count("shutdown")) {
             serverGlobalParams.doFork = true;
         }