diff options
| author | Andreas Nilsson <andreas.nilsson@10gen.com> | 2013-11-14 18:34:21 +0000 |
|---|---|---|
| committer | Andreas Nilsson <andreas.nilsson@10gen.com> | 2013-11-14 19:11:40 +0000 |
| commit | 914602bfd51a6a9e83d24abe6e293c749c09c7e0 (patch) | |
| tree | 9cf1c38d934ec713520ba69a3a3580fcad68bbfc /src/mongo/db/initialize_server_global_state.cpp | |
| parent | 9030cdfa8707c06b3f8ad9dfb635c2244abcc84e (diff) | |
| download | mongo-914602bfd51a6a9e83d24abe6e293c749c09c7e0.tar.gz | |
SERVER-11431 Change clusterAuthMode with setParameter command
Diffstat (limited to 'src/mongo/db/initialize_server_global_state.cpp')
| -rw-r--r-- | src/mongo/db/initialize_server_global_state.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp index 3e40a4da25c..0712c2d3052 100644 --- a/src/mongo/db/initialize_server_global_state.cpp +++ b/src/mongo/db/initialize_server_global_state.cpp @@ -320,7 +320,9 @@ namespace mongo { } } - if (!serverGlobalParams.keyFile.empty() && serverGlobalParams.clusterAuthMode != "x509") { + int clusterAuthMode = serverGlobalParams.clusterAuthMode.load(); + if (!serverGlobalParams.keyFile.empty() && + clusterAuthMode != ServerGlobalParams::ClusterAuthMode_x509) { if (!setUpSecurityKey(serverGlobalParams.keyFile)) { // error message printed in setUpPrivateKey return false; @@ -329,13 +331,14 @@ namespace mongo { // Auto-enable auth except if clusterAuthMode is not set. // clusterAuthMode is automatically set if a --keyFile parameter is provided. - if (!serverGlobalParams.clusterAuthMode.empty()) { + if (clusterAuthMode != ServerGlobalParams::ClusterAuthMode_undefined) { getGlobalAuthorizationManager()->setAuthEnabled(true); } #ifdef MONGO_SSL - if (serverGlobalParams.clusterAuthMode == "x509" || - serverGlobalParams.clusterAuthMode == "sendX509") { + + if (clusterAuthMode == ServerGlobalParams::ClusterAuthMode_x509 || + clusterAuthMode == ServerGlobalParams::ClusterAuthMode_sendX509) { setInternalUserAuthParams(BSON(saslCommandMechanismFieldName << "MONGODB-X509" << saslCommandUserDBFieldName << "$external" << saslCommandUserFieldName << |