SERVER-23044 Fall back to system CA certs if CA file isn't provided

3 files changed, 0 insertions, 16 deletions

diff --git a/src/mongo/shell/shell_options.cpp b/src/mongo/shell/shell_options.cpp
index 5ba9bca4227..bef83eb90bb 100644
--- a/src/mongo/shell/shell_options.cpp
+++ b/src/mongo/shell/shell_options.cpp
@@ -381,14 +381,4 @@ Status storeMongoShellOptions(const moe::Environment& params,
 
     return Status::OK();
 }
-
-Status validateMongoShellOptions(const moe::Environment& params) {
-#ifdef MONGO_CONFIG_SSL
-    Status ret = validateSSLMongoShellOptions(params);
-    if (!ret.isOK()) {
-        return ret;
-    }
-#endif
-    return Status::OK();
-}
 }
diff --git a/src/mongo/shell/shell_options.h b/src/mongo/shell/shell_options.h
index 4699f3d09f4..3451143543e 100644
--- a/src/mongo/shell/shell_options.h
+++ b/src/mongo/shell/shell_options.h
@@ -90,6 +90,4 @@ bool handlePreValidationMongoShellOptions(const moe::Environment& params,
                                           const std::vector<std::string>& args);
 
 Status storeMongoShellOptions(const moe::Environment& params, const std::vector<std::string>& args);
-
-Status validateMongoShellOptions(const moe::Environment& params);
 }
diff --git a/src/mongo/shell/shell_options_init.cpp b/src/mongo/shell/shell_options_init.cpp
index ff6c0792ca5..e1374ec4691 100644
--- a/src/mongo/shell/shell_options_init.cpp
+++ b/src/mongo/shell/shell_options_init.cpp
@@ -47,10 +47,6 @@ MONGO_STARTUP_OPTIONS_VALIDATE(MongoShellOptions)(InitializerContext* context) {
     if (!ret.isOK()) {
         return ret;
     }
-    ret = validateMongoShellOptions(moe::startupOptionsParsed);
-    if (!ret.isOK()) {
-        return ret;
-    }
 
     return Status::OK();
 }