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

diff --git a/src/mongo/db/mongod_options_init.cpp b/src/mongo/db/mongod_options_init.cpp
index e8cfa3ef1a0..a8c8ebb74cd 100644
--- a/src/mongo/db/mongod_options_init.cpp
+++ b/src/mongo/db/mongod_options_init.cpp
@@ -65,9 +65,7 @@ namespace mongo {
     }
 
     MONGO_INITIALIZER_GENERAL(MongodOptions_Store,
-                              ("BeginStartupOptionStorage",
-                               "CreateAuthorizationManager"), // Requried to call
-                                                              // getGlobalAuthorizationManager().
+                              ("BeginStartupOptionStorage"),
                               ("EndStartupOptionStorage"))
                              (InitializerContext* context) {
         Status ret = storeMongodOptions(moe::startupOptionsParsed, context->args());