diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-10-11 08:09:52 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-10-12 07:10:58 -0400 |
| commit | ae2b60fce624cd9f4a95037316033b53846be176 (patch) | |
| tree | 8cc0df2f5645baa710dd135c071f65b558c02320 /src/mongo/db/initialize_server_global_state.cpp | |
| parent | 849c85561e065598813d6a702ce132f494380eed (diff) | |
| download | mongo-ae2b60fce624cd9f4a95037316033b53846be176.tar.gz | |
SERVER-37563 Remove all usages of getGlobalAuthorizationManager
Diffstat (limited to 'src/mongo/db/initialize_server_global_state.cpp')
| -rw-r--r-- | src/mongo/db/initialize_server_global_state.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp index 847873010ee..860256ef483 100644 --- a/src/mongo/db/initialize_server_global_state.cpp +++ b/src/mongo/db/initialize_server_global_state.cpp @@ -47,7 +47,6 @@ #include "mongo/base/init.h" #include "mongo/config.h" #include "mongo/db/auth/authorization_manager.h" -#include "mongo/db/auth/authorization_manager_global.h" #include "mongo/db/auth/internal_user_auth.h" #include "mongo/db/auth/sasl_command_constants.h" #include "mongo/db/auth/security_key.h" @@ -364,8 +363,7 @@ MONGO_INITIALIZER(MungeUmask)(InitializerContext*) { } // namespace #endif -bool initializeServerGlobalState() { - +bool initializeServerGlobalState(ServiceContext* service) { #ifndef _WIN32 if (!serverGlobalParams.noUnixSocket && !fs::is_directory(serverGlobalParams.socket)) { cout << serverGlobalParams.socket << " must be a directory" << endl; @@ -393,11 +391,10 @@ bool initializeServerGlobalState() { // clusterAuthMode defaults to "keyFile" if a --keyFile parameter is provided. if (clusterAuthMode != ServerGlobalParams::ClusterAuthMode_undefined && !serverGlobalParams.transitionToAuth) { - getGlobalAuthorizationManager()->setAuthEnabled(true); + AuthorizationManager::get(service)->setAuthEnabled(true); } #ifdef MONGO_CONFIG_SSL - if (clusterAuthMode == ServerGlobalParams::ClusterAuthMode_x509 || clusterAuthMode == ServerGlobalParams::ClusterAuthMode_sendX509) { setInternalUserAuthParams( @@ -409,6 +406,7 @@ bool initializeServerGlobalState() { << getSSLManager()->getSSLConfiguration().clientSubjectName.toString())); } #endif + return true; } |