summaryrefslogtreecommitdiff
path: root/src/mongo/s/mongos_options.cpp
diff options
context:
space:
mode:
authorSara Golemon <sara.golemon@mongodb.com>2018-07-06 11:34:51 -0400
committerSara Golemon <sara.golemon@mongodb.com>2018-07-09 10:44:50 -0400
commit971aa249002a1a8d2a3311e139594e1825faee55 (patch)
treec22525714fef6b374b62519cd75a1fc545fd0bd7 /src/mongo/s/mongos_options.cpp
parentffbaee1a4dcb47a307986cb696807fe979f4a39d (diff)
downloadmongo-971aa249002a1a8d2a3311e139594e1825faee55.tar.gz
SERVER-35979 Split ssl_otions and decouple from main runtime
Diffstat (limited to 'src/mongo/s/mongos_options.cpp')
-rw-r--r--src/mongo/s/mongos_options.cpp21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/mongo/s/mongos_options.cpp b/src/mongo/s/mongos_options.cpp
index 32dccbf6f4c..ce112e8275f 100644
--- a/src/mongo/s/mongos_options.cpp
+++ b/src/mongo/s/mongos_options.cpp
@@ -46,7 +46,6 @@
#include "mongo/util/log.h"
#include "mongo/util/mongoutils/str.h"
#include "mongo/util/net/socket_utils.h"
-#include "mongo/util/net/ssl_options.h"
#include "mongo/util/options_parser/startup_options.h"
#include "mongo/util/startup_test.h"
#include "mongo/util/stringutils.h"
@@ -72,15 +71,6 @@ Status addMongosOptions(moe::OptionSection* options) {
}
#endif
-#ifdef MONGO_CONFIG_SSL
- moe::OptionSection ssl_options("SSL options");
-
- ret = addSSLServerOptions(&ssl_options);
- if (!ret.isOK()) {
- return ret;
- }
-#endif
-
moe::OptionSection sharding_options("Sharding options");
sharding_options.addOptionChaining("sharding.configDB",
@@ -127,10 +117,6 @@ Status addMongosOptions(moe::OptionSection* options) {
options->addSection(sharding_options).transitional_ignore();
-#ifdef MONGO_CONFIG_SSL
- options->addSection(ssl_options).transitional_ignore();
-#endif
-
return Status::OK();
}
@@ -173,13 +159,6 @@ Status canonicalizeMongosOptions(moe::Environment* params) {
return ret;
}
-#ifdef MONGO_CONFIG_SSL
- ret = canonicalizeSSLServerOptions(params);
- if (!ret.isOK()) {
- return ret;
- }
-#endif
-
return Status::OK();
}