Revert "SERVER-13644 Fix command line censorship"

This reverts commit 44da20890f6af02ba766ca14991bbb072395a7ef.

1 files changed, 4 insertions, 15 deletions

diff --git a/src/mongo/util/cmdline_utils/censor_cmdline.cpp b/src/mongo/util/cmdline_utils/censor_cmdline.cpp
index ae51d536be4..e50b7018c99 100644
--- a/src/mongo/util/cmdline_utils/censor_cmdline.cpp
+++ b/src/mongo/util/cmdline_utils/censor_cmdline.cpp
@@ -41,9 +41,9 @@ namespace mongo {
 
     static bool _isPasswordArgument(const char* argumentName) {
         static const char* const passwordArguments[] = {
-            "net.ssl.PEMKeyPassword",
-            "net.ssl.clusterPassword",
-            "processManagement.windowsService.servicePassword",
+            "sslPEMKeyPassword",
+            "ssl.PEMKeyPassword",
+            "servicePassword",
             NULL  // Last entry sentinel.
         };
         for (const char* const* current = passwordArguments; *current; ++current) {
@@ -54,13 +54,6 @@ namespace mongo {
     }
 
     static bool _isPasswordSwitch(const char* switchName) {
-        static const char* const passwordSwitches[] = {
-            "sslPEMKeyPassword",
-            "sslClusterPassword",
-            "servicePassword",
-            NULL  // Last entry sentinel.
-        };
-
         if (switchName[0] != '-')
             return false;
         size_t i = 1;
@@ -68,11 +61,7 @@ namespace mongo {
             i = 2;
         switchName += i;
 
-        for (const char* const* current = passwordSwitches; *current; ++current) {
-            if (mongoutils::str::equals(switchName, *current))
-                return true;
-        }
-        return false;
+        return _isPasswordArgument(switchName);
     }
 
     static void _redact(char* arg) {