1 files changed, 7 insertions, 17 deletions
diff --git a/src/mongo/db/auth/sasl_mechanism_registry.cpp b/src/mongo/db/auth/sasl_mechanism_registry.cpp
index 3426ca97b80..cb588b9b829 100644
--- a/src/mongo/db/auth/sasl_mechanism_registry.cpp
+++ b/src/mongo/db/auth/sasl_mechanism_registry.cpp
@@ -124,23 +124,13 @@ bool SASLServerMechanismRegistry::_mechanismSupportedByConfig(StringData mechNam
     return sequenceContains(saslGlobalParams.authenticationMechanisms, mechName);
 }
 
-GlobalInitializerRegisterer SASLServerMechanismRegistryInitializer(
+namespace {
+ServiceContext::ConstructorActionRegisterer SASLServerMechanismRegistryInitializer{
     "CreateSASLServerMechanismRegistry",
-    {"ServiceContext"},
-    [](InitializerContext* context) {
-        if (saslGlobalParams.hostName.empty())
-            saslGlobalParams.hostName = getHostNameCached();
-        if (saslGlobalParams.serviceName.empty())
-            saslGlobalParams.serviceName = "mongodb";
-
-        auto registry = stdx::make_unique<SASLServerMechanismRegistry>();
-        SASLServerMechanismRegistry::set(getGlobalServiceContext(), std::move(registry));
-        return Status::OK();
-    },
-    [](DeinitializerContext* context) {
-        SASLServerMechanismRegistry::set(getGlobalServiceContext(), nullptr);
-
-        return Status::OK();
-    });
+    {"EndStartupOptionStorage"},
+    [](ServiceContext* service) {
+        SASLServerMechanismRegistry::set(service, std::make_unique<SASLServerMechanismRegistry>());
+    }};
+}  // namespace
 
 }  // namespace mongo