summaryrefslogtreecommitdiff
path: root/src/mongo/db/auth/sasl_options.cpp
diff options
context:
space:
mode:
authorAndreas Nilsson <andreas.nilsson@10gen.com>2014-09-11 12:16:53 -0400
committerAndreas Nilsson <andreas.nilsson@10gen.com>2014-09-11 19:19:53 -0400
commitc9eab15c54d135dcf3357802402b1d8d2855b212 (patch)
treef53f007de4be633de92c81d381ea6e8eacd2c2c7 /src/mongo/db/auth/sasl_options.cpp
parent36a6b94c4d6e44b192da3059f6efe42fe4d82f50 (diff)
downloadmongo-c9eab15c54d135dcf3357802402b1d8d2855b212.tar.gz
SERVER-15177 Use native SCRAM-SHA-1 in Enterprise version
Diffstat (limited to 'src/mongo/db/auth/sasl_options.cpp')
-rw-r--r--src/mongo/db/auth/sasl_options.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mongo/db/auth/sasl_options.cpp b/src/mongo/db/auth/sasl_options.cpp
index 5ca25f5fec5..40fc536656c 100644
--- a/src/mongo/db/auth/sasl_options.cpp
+++ b/src/mongo/db/auth/sasl_options.cpp
@@ -44,8 +44,7 @@ namespace mongo {
SASLGlobalParams::SASLGlobalParams() {
authenticationMechanisms.push_back("MONGODB-CR");
authenticationMechanisms.push_back("MONGODB-X509");
- // TODO: Enable SCRAM-SHA-1 as a default mech when all platforms support it
- // authenticationMechanisms.push_back("SCRAM-SHA-1");
+ authenticationMechanisms.push_back("SCRAM-SHA-1");
}
Status addSASLOptions(moe::OptionSection* options) {