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, 5 insertions, 3 deletions

diff --git a/src/mongo/db/curop_test.cpp b/src/mongo/db/curop_test.cpp
index 85ad5d98973..26a4472078c 100644
--- a/src/mongo/db/curop_test.cpp
+++ b/src/mongo/db/curop_test.cpp
@@ -74,9 +74,11 @@ namespace mongo {
                 sleepmillis(10);
             }
 
-            setGlobalServiceContext(stdx::make_unique<ServiceContextNoop>());
-            setGlobalAuthorizationManager(
-                    new AuthorizationManager(new AuthzManagerExternalStateMock()));
+            auto service = stdx::make_unique<ServiceContextNoop>();
+            AuthorizationManager::set(
+                    service.get(),
+                    stdx::make_unique<AuthorizationManager>(new AuthzManagerExternalStateMock()));
+            setGlobalServiceContext(std::move(service));
             Client::initThread("CurOpTestMain");
             return Status::OK();
         }