SERVER-11572 permit no-password auth for Windows Kerberos mongo shell from command line

1 files changed, 8 insertions, 3 deletions

diff --git a/src/mongo/shell/dbshell.cpp b/src/mongo/shell/dbshell.cpp
index 59f2c876fa0..38e2a2017a7 100644
--- a/src/mongo/shell/dbshell.cpp
+++ b/src/mongo/shell/dbshell.cpp
@@ -706,7 +706,9 @@ int _main( int argc, char* argv[], char **envp ) {
 
     if (!shellGlobalParams.nodb && shellGlobalParams.username.size()) {
         authStringStream << "var username = \"" << shellGlobalParams.username << "\";" << endl;
-        authStringStream << "var password = \"" << shellGlobalParams.password << "\";" << endl;
+        if (shellGlobalParams.usingPassword) {
+            authStringStream << "var password = \"" << shellGlobalParams.password << "\";" << endl;
+        }
         if (shellGlobalParams.authenticationDatabase.empty()) {
             authStringStream << "var authDb = db;" << endl;
         }
@@ -715,8 +717,11 @@ int _main( int argc, char* argv[], char **envp ) {
                              << shellGlobalParams.authenticationDatabase << "\");" << endl;
         }
         authStringStream << "authDb._authOrThrow({ " <<
-            saslCommandUserFieldName << ": username, " <<
-            saslCommandPasswordFieldName << ": password });" << endl;
+            saslCommandUserFieldName << ": username ";
+        if (shellGlobalParams.usingPassword) { 
+            authStringStream << ", " << saslCommandPasswordFieldName << ": password ";
+        }
+        authStringStream << "});" << endl;
     }
     authStringStream << "}())";
     mongo::shell_utils::_dbAuth = authStringStream.str();