diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-05-28 18:40:59 -0400 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-05-28 18:40:59 -0400 |
commit | 8bc2783d2e6e39c0910455b4eac9e0f93a482cfc (patch) | |
tree | 46a523ea698d1a9a80013816d8e568e2fdd2f2dc /src/mongo/db/auth/authz_manager_external_state.cpp | |
parent | 0672061deb58aac931912bed68d014247c581968 (diff) | |
download | mongo-8bc2783d2e6e39c0910455b4eac9e0f93a482cfc.tar.gz |
Revert "SERVER-13961 Pass LockState to DBWrite and DBRead directly"
This reverts commit 0672061deb58aac931912bed68d014247c581968.
Diffstat (limited to 'src/mongo/db/auth/authz_manager_external_state.cpp')
-rw-r--r-- | src/mongo/db/auth/authz_manager_external_state.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mongo/db/auth/authz_manager_external_state.cpp b/src/mongo/db/auth/authz_manager_external_state.cpp index 25640191cec..e5f63496799 100644 --- a/src/mongo/db/auth/authz_manager_external_state.cpp +++ b/src/mongo/db/auth/authz_manager_external_state.cpp @@ -40,8 +40,7 @@ namespace mongo { AuthzManagerExternalState::AuthzManagerExternalState() {} AuthzManagerExternalState::~AuthzManagerExternalState() {} - Status AuthzManagerExternalState::getPrivilegeDocumentV1(OperationContext* txn, - const StringData& dbname, + Status AuthzManagerExternalState::getPrivilegeDocumentV1(const StringData& dbname, const UserName& userName, BSONObj* result) { if (userName == internalSecurity.user->getName()) { @@ -70,7 +69,7 @@ namespace mongo { // Query for the privilege document BSONObj userBSONObj; - Status found = findOne(txn, usersNamespace, queryBuilder.done(), &userBSONObj); + Status found = findOne(usersNamespace, queryBuilder.done(), &userBSONObj); if (!found.isOK()) { if (found.code() == ErrorCodes::NoMatchingDocument) { // Return more detailed status that includes user name. @@ -98,10 +97,9 @@ namespace mongo { return Status::OK(); } - bool AuthzManagerExternalState::hasAnyPrivilegeDocuments(OperationContext* txn) { + bool AuthzManagerExternalState::hasAnyPrivilegeDocuments() { BSONObj userBSONObj; Status status = findOne( - txn, AuthorizationManager::usersCollectionNamespace, BSONObj(), &userBSONObj); |