diff options
| author | Robert Guo <robert.guo@10gen.com> | 2015-07-29 15:40:52 -0400 |
|---|---|---|
| committer | Robert Guo <robert.guo@10gen.com> | 2015-07-29 18:14:19 -0400 |
| commit | 5154fad0a86b5be74e8a2808c9a714a6f74b4bfc (patch) | |
| tree | 4c7b139a3bbb68db2ee40f45dfb4ebb63413ef38 /src | |
| parent | 6e6435e556a09e1f1a7a565c45f1240a80aa0942 (diff) | |
| download | mongo-5154fad0a86b5be74e8a2808c9a714a6f74b4bfc.tar.gz | |
SERVER-19433 sslFIPSMode no longer requires requireSSL
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/util/net/ssl_options.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/util/net/ssl_options.cpp b/src/mongo/util/net/ssl_options.cpp index 881718179a4..84df888edb9 100644 --- a/src/mongo/util/net/ssl_options.cpp +++ b/src/mongo/util/net/ssl_options.cpp @@ -162,8 +162,7 @@ Status addSSLClientOptions(moe::OptionSection* options) { .requires("ssl"); options->addOptionChaining( - "ssl.FIPSMode", "sslFIPSMode", moe::Switch, "activate FIPS 140-2 mode at startup") - .requires("ssl"); + "ssl.FIPSMode", "sslFIPSMode", moe::Switch, "activate FIPS 140-2 mode at startup"); return Status::OK(); } @@ -332,7 +331,7 @@ Status storeSSLServerOptions(const moe::Environment& params) { sslGlobalParams.sslCAFile.size() || sslGlobalParams.sslCRLFile.size() || sslGlobalParams.sslCipherConfig.size() || sslGlobalParams.sslDisabledProtocols.size() || - sslGlobalParams.sslWeakCertificateValidation || sslGlobalParams.sslFIPSMode) { + sslGlobalParams.sslWeakCertificateValidation) { return Status(ErrorCodes::BadValue, "need to enable SSL via the sslMode flag when " "using SSL configuration parameters"); |