diff options
| author | Louis Williams <louis.williams@mongodb.com> | 2018-05-24 10:29:13 -0400 |
|---|---|---|
| committer | Louis Williams <louis.williams@mongodb.com> | 2018-05-24 10:29:13 -0400 |
| commit | 94ffe6335098e4d2df84b53af37ac33cc9db14b9 (patch) | |
| tree | cd3b4910f84a4f8260ddf10ec7ef6ff6299f2df6 /src/mongo/db | |
| parent | fec5bb476ac7677d716aa6714b6a4b0eb74db9e6 (diff) | |
| download | mongo-94ffe6335098e4d2df84b53af37ac33cc9db14b9.tar.gz | |
Revert "SERVER-34944 Create a shim-override mechanism."
This reverts commit 56c53c382daef891ac0951464e5e23ccdd5c0263.
Diffstat (limited to 'src/mongo/db')
| -rw-r--r-- | src/mongo/db/auth/authorization_manager_global.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/db/catalog/SConscript | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/mongo/db/auth/authorization_manager_global.cpp b/src/mongo/db/auth/authorization_manager_global.cpp index 3f8a8808d04..b626c3b5573 100644 --- a/src/mongo/db/auth/authorization_manager_global.cpp +++ b/src/mongo/db/auth/authorization_manager_global.cpp @@ -93,10 +93,7 @@ MONGO_EXPORT_STARTUP_SERVER_PARAMETER(startupAuthSchemaValidation, bool, true); GlobalInitializerRegisterer authorizationManagerInitializer( "CreateAuthorizationManager", - {MONGO_SHIM_DEPENDENCY(AuthorizationManager::create), - "OIDGeneration", - "EndStartupOptionStorage", - "ServiceContext"}, + {"OIDGeneration", "EndStartupOptionStorage", "ServiceContext"}, [](InitializerContext* context) { auto authzManager = AuthorizationManager::create(); authzManager->setAuthEnabled(serverGlobalParams.authState == diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 5ced8ff384b..259ea12ab77 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -103,7 +103,6 @@ env.Library( "index_catalog.cpp", ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', ], ) @@ -113,7 +112,6 @@ env.Library( "index_catalog_entry.cpp", ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', ], ) @@ -160,10 +158,9 @@ env.CppUnitTest( env.Library( target='database_holder', source=[ - 'database_holder.cpp', + "database_holder.cpp", ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', ], ) @@ -173,7 +170,6 @@ env.Library( 'collection_info_cache.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', ], ) @@ -183,7 +179,6 @@ env.Library( 'index_create.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/base', ], ) |