diff options
| author | Spencer Jackson <spencer.jackson@mongodb.com> | 2015-03-16 15:21:12 -0400 |
|---|---|---|
| committer | Spencer Jackson <spencer.jackson@mongodb.com> | 2015-04-02 11:32:09 -0400 |
| commit | 61e9a413e9c8f09a034557cfcae678f7a8527ae2 (patch) | |
| tree | 6e1c2b1531a3ee6ce4403afd54c45bcb816242d9 /src/mongo/util/net/ssl_options.cpp | |
| parent | a0bb65b88e71c4f3cb1e2033b716716bae1a08f9 (diff) | |
| download | mongo-61e9a413e9c8f09a034557cfcae678f7a8527ae2.tar.gz | |
SERVER-17548: Refactor SSLManager's Param class
Diffstat (limited to 'src/mongo/util/net/ssl_options.cpp')
| -rw-r--r-- | src/mongo/util/net/ssl_options.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/util/net/ssl_options.cpp b/src/mongo/util/net/ssl_options.cpp index c4ff4f2c48c..8369a1948b6 100644 --- a/src/mongo/util/net/ssl_options.cpp +++ b/src/mongo/util/net/ssl_options.cpp @@ -187,16 +187,16 @@ namespace mongo { if (params.count("net.ssl.mode")) { std::string sslModeParam = params["net.ssl.mode"].as<string>(); if (sslModeParam == "disabled") { - sslGlobalParams.sslMode.store(SSLGlobalParams::SSLMode_disabled); + sslGlobalParams.sslMode.store(SSLParams::SSLMode_disabled); } else if (sslModeParam == "allowSSL") { - sslGlobalParams.sslMode.store(SSLGlobalParams::SSLMode_allowSSL); + sslGlobalParams.sslMode.store(SSLParams::SSLMode_allowSSL); } else if (sslModeParam == "preferSSL") { - sslGlobalParams.sslMode.store(SSLGlobalParams::SSLMode_preferSSL); + sslGlobalParams.sslMode.store(SSLParams::SSLMode_preferSSL); } else if (sslModeParam == "requireSSL") { - sslGlobalParams.sslMode.store(SSLGlobalParams::SSLMode_requireSSL); + sslGlobalParams.sslMode.store(SSLParams::SSLMode_requireSSL); } else { return Status(ErrorCodes::BadValue, @@ -258,7 +258,7 @@ namespace mongo { } int clusterAuthMode = serverGlobalParams.clusterAuthMode.load(); - if (sslGlobalParams.sslMode.load() != SSLGlobalParams::SSLMode_disabled) { + if (sslGlobalParams.sslMode.load() != SSLParams::SSLMode_disabled) { if (sslGlobalParams.sslPEMKeyFile.size() == 0) { return Status(ErrorCodes::BadValue, "need sslPEMKeyFile when SSL is enabled"); @@ -299,11 +299,11 @@ namespace mongo { if (clusterAuthMode == ServerGlobalParams::ClusterAuthMode_sendKeyFile || clusterAuthMode == ServerGlobalParams::ClusterAuthMode_sendX509 || clusterAuthMode == ServerGlobalParams::ClusterAuthMode_x509) { - if (sslGlobalParams.sslMode.load() == SSLGlobalParams::SSLMode_disabled) { + if (sslGlobalParams.sslMode.load() == SSLParams::SSLMode_disabled) { return Status(ErrorCodes::BadValue, "need to enable SSL via the sslMode flag"); } } - if (sslGlobalParams.sslMode.load() == SSLGlobalParams::SSLMode_allowSSL) { + if (sslGlobalParams.sslMode.load() == SSLParams::SSLMode_allowSSL) { if (clusterAuthMode == ServerGlobalParams::ClusterAuthMode_sendX509 || clusterAuthMode == ServerGlobalParams::ClusterAuthMode_x509) { return Status(ErrorCodes::BadValue, @@ -315,7 +315,7 @@ namespace mongo { Status storeSSLClientOptions(const moe::Environment& params) { if (params.count("ssl") && params["ssl"].as<bool>() == true) { - sslGlobalParams.sslMode.store(SSLGlobalParams::SSLMode_requireSSL); + sslGlobalParams.sslMode.store(SSLParams::SSLMode_requireSSL); } if (params.count("ssl.PEMKeyFile")) { sslGlobalParams.sslPEMKeyFile = params["ssl.PEMKeyFile"].as<std::string>(); |