diff options
| author | Spencer T Brody <spencer@mongodb.com> | 2015-08-19 16:46:53 -0400 |
|---|---|---|
| committer | Spencer T Brody <spencer@mongodb.com> | 2015-08-25 12:56:27 -0400 |
| commit | eb0430ee860d22b164cd603ce7186842f72c8537 (patch) | |
| tree | 86064e9a015fa76e537eba6640dc6e37da0067f5 /src/mongo/db/auth | |
| parent | 0931a7e2eff3fcb6c8b06b0649069fbb625d05ae (diff) | |
| download | mongo-eb0430ee860d22b164cd603ce7186842f72c8537.tar.gz | |
SERVER-19875 Make (almost) all CatalogManager methods take OperationContext
Diffstat (limited to 'src/mongo/db/auth')
| -rw-r--r-- | src/mongo/db/auth/authz_manager_external_state_s.cpp | 18 | ||||
| -rw-r--r-- | src/mongo/db/auth/user_cache_invalidator_job.cpp | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/db/auth/authz_manager_external_state_s.cpp b/src/mongo/db/auth/authz_manager_external_state_s.cpp index ecb2d014c4f..df94ff8bcc2 100644 --- a/src/mongo/db/auth/authz_manager_external_state_s.cpp +++ b/src/mongo/db/auth/authz_manager_external_state_s.cpp @@ -69,8 +69,8 @@ Status AuthzManagerExternalStateMongos::getStoredAuthorizationVersion(OperationC // that runs this command BSONObj getParameterCmd = BSON("getParameter" << 1 << authSchemaVersionServerParameter << 1); BSONObjBuilder builder; - const bool ok = - grid.catalogManager(txn)->runUserManagementReadCommand("admin", getParameterCmd, &builder); + const bool ok = grid.catalogManager(txn) + ->runUserManagementReadCommand(txn, "admin", getParameterCmd, &builder); BSONObj cmdResult = builder.obj(); if (!ok) { return Command::getStatusFromCommandResult(cmdResult); @@ -95,8 +95,8 @@ Status AuthzManagerExternalStateMongos::getUserDescription(OperationContext* txn << userName.getDB())) << "showPrivileges" << true << "showCredentials" << true); BSONObjBuilder builder; - const bool ok = - grid.catalogManager(txn)->runUserManagementReadCommand("admin", usersInfoCmd, &builder); + const bool ok = grid.catalogManager(txn) + ->runUserManagementReadCommand(txn, "admin", usersInfoCmd, &builder); BSONObj cmdResult = builder.obj(); if (!ok) { return Command::getStatusFromCommandResult(cmdResult); @@ -126,8 +126,8 @@ Status AuthzManagerExternalStateMongos::getRoleDescription(OperationContext* txn << roleName.getRole() << AuthorizationManager::ROLE_DB_FIELD_NAME << roleName.getDB())) << "showPrivileges" << showPrivileges); BSONObjBuilder builder; - const bool ok = - grid.catalogManager(txn)->runUserManagementReadCommand("admin", rolesInfoCmd, &builder); + const bool ok = grid.catalogManager(txn) + ->runUserManagementReadCommand(txn, "admin", rolesInfoCmd, &builder); BSONObj cmdResult = builder.obj(); if (!ok) { return Command::getStatusFromCommandResult(cmdResult); @@ -156,7 +156,7 @@ Status AuthzManagerExternalStateMongos::getRoleDescriptionsForDB(OperationContex << "showBuiltinRoles" << showBuiltinRoles); BSONObjBuilder builder; const bool ok = - grid.catalogManager(txn)->runUserManagementReadCommand(dbname, rolesInfoCmd, &builder); + grid.catalogManager(txn)->runUserManagementReadCommand(txn, dbname, rolesInfoCmd, &builder); BSONObj cmdResult = builder.obj(); if (!ok) { return Command::getStatusFromCommandResult(cmdResult); @@ -170,8 +170,8 @@ Status AuthzManagerExternalStateMongos::getRoleDescriptionsForDB(OperationContex bool AuthzManagerExternalStateMongos::hasAnyPrivilegeDocuments(OperationContext* txn) { BSONObj usersInfoCmd = BSON("usersInfo" << 1); BSONObjBuilder builder; - const bool ok = - grid.catalogManager(txn)->runUserManagementReadCommand("admin", usersInfoCmd, &builder); + const bool ok = grid.catalogManager(txn) + ->runUserManagementReadCommand(txn, "admin", usersInfoCmd, &builder); if (!ok) { // If we were unable to complete the query, // it's best to assume that there _are_ privilege documents. This might happen diff --git a/src/mongo/db/auth/user_cache_invalidator_job.cpp b/src/mongo/db/auth/user_cache_invalidator_job.cpp index 8ad27ca4484..7de2fb1a1d9 100644 --- a/src/mongo/db/auth/user_cache_invalidator_job.cpp +++ b/src/mongo/db/auth/user_cache_invalidator_job.cpp @@ -92,7 +92,7 @@ StatusWith<OID> getCurrentCacheGeneration(OperationContext* txn) { try { BSONObjBuilder result; const bool ok = grid.catalogManager(txn)->runUserManagementReadCommand( - "admin", BSON("_getUserCacheGeneration" << 1), &result); + txn, "admin", BSON("_getUserCacheGeneration" << 1), &result); if (!ok) { return Command::getStatusFromCommandResult(result.obj()); } |