SERVER-8709 stricted command line parsing

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mongo/db/cmdline.cpp b/src/mongo/db/cmdline.cpp
index 253181d3f1d..0dea50faeef 100644
--- a/src/mongo/db/cmdline.cpp
+++ b/src/mongo/db/cmdline.cpp
@@ -418,7 +418,7 @@ namespace {
         if (params.count("sslOnNormalPorts")) {
             cmdLine.sslOnNormalPorts = true;
             if ( cmdLine.sslPEMKeyFile.size() == 0 ) {
-                log() << "need sslPEMKeyFile" << endl;
+                log() << "need sslPEMKeyFile with sslOnNormalPorts" << endl;
                 return false;
             }
             if (cmdLine.sslWeakCertificateValidation &&
@@ -426,6 +426,11 @@ namespace {
                 log() << "need sslCAFile with sslWeakCertificateValidation" << endl;
                 return false;
             }
+            if (!cmdLine.sslCRLFile.empty() &&
+                cmdLine.sslCAFile.empty()) {
+                log() << "need sslCAFile with sslCRLFile" << endl;
+                return false;
+            }
             if (params.count("sslFIPSMode")) {
                 cmdLine.sslFIPSMode = true;
             }