SERVER-17817 Make AuthorizationManager a decoration on ServiceContext.

While we're in there, make it a fatal error to call AuthorizationManager::set or AuthorizationSession::set twice on the same object.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/mongo/dbtests/dbtests.cpp b/src/mongo/dbtests/dbtests.cpp
index 53e5f54b5ec..230277f966c 100644
--- a/src/mongo/dbtests/dbtests.cpp
+++ b/src/mongo/dbtests/dbtests.cpp
@@ -111,7 +111,9 @@ int dbtestsMain( int argc, char** argv, char** envp ) {
     repl::setGlobalReplicationCoordinator(new repl::ReplicationCoordinatorMock(replSettings));
     Command::testCommandsEnabled = 1;
     mongo::runGlobalInitializersOrDie(argc, argv, envp);
-    setGlobalAuthorizationManager(new AuthorizationManager(new AuthzManagerExternalStateMongod()));
+    AuthorizationManager::set(
+            getGlobalServiceContext(),
+            stdx::make_unique<AuthorizationManager>(new AuthzManagerExternalStateMongod()));
     StartupTest::runTests();
     return mongo::dbtests::runDbTests(argc, argv);
 }