1 files changed, 13 insertions, 13 deletions

diff --git a/src/mongo/db/commands/authentication_commands.cpp b/src/mongo/db/commands/authentication_commands.cpp
index 8de3931d529..95a92d89e3a 100644
--- a/src/mongo/db/commands/authentication_commands.cpp
+++ b/src/mongo/db/commands/authentication_commands.cpp
@@ -113,7 +113,7 @@ public:
     virtual void addRequiredPrivileges(const std::string& dbname,
                                        const BSONObj& cmdObj,
                                        std::vector<Privilege>* out) {}  // No auth required
-    bool run(OperationContext* txn,
+    bool run(OperationContext* opCtx,
              const string&,
              BSONObj& cmdObj,
              int,
@@ -151,7 +151,7 @@ void CmdAuthenticate::redactForLogging(mutablebson::Document* cmdObj) {
     }
 }
 
-bool CmdAuthenticate::run(OperationContext* txn,
+bool CmdAuthenticate::run(OperationContext* opCtx,
                           const string& dbname,
                           BSONObj& cmdObj,
                           int,
@@ -167,7 +167,7 @@ bool CmdAuthenticate::run(OperationContext* txn,
         mechanism = "MONGODB-CR";
     }
     UserName user;
-    auto& sslPeerInfo = SSLPeerInfo::forSession(txn->getClient()->session());
+    auto& sslPeerInfo = SSLPeerInfo::forSession(opCtx->getClient()->session());
     if (mechanism == "MONGODB-X509" && !cmdObj.hasField("user")) {
         user = UserName(sslPeerInfo.subjectName, dbname);
     } else {
@@ -182,7 +182,7 @@ bool CmdAuthenticate::run(OperationContext* txn,
         user = internalSecurity.user->getName();
     }
 
-    Status status = _authenticate(txn, mechanism, user, cmdObj);
+    Status status = _authenticate(opCtx, mechanism, user, cmdObj);
     audit::logAuthentication(Client::getCurrent(), mechanism, user, status.code());
     if (!status.isOK()) {
         if (!serverGlobalParams.quiet.load()) {
@@ -204,22 +204,22 @@ bool CmdAuthenticate::run(OperationContext* txn,
     return true;
 }
 
-Status CmdAuthenticate::_authenticate(OperationContext* txn,
+Status CmdAuthenticate::_authenticate(OperationContext* opCtx,
                                       const std::string& mechanism,
                                       const UserName& user,
                                       const BSONObj& cmdObj) {
     if (mechanism == "MONGODB-CR") {
-        return _authenticateCR(txn, user, cmdObj);
+        return _authenticateCR(opCtx, user, cmdObj);
     }
 #ifdef MONGO_CONFIG_SSL
     if (mechanism == "MONGODB-X509") {
-        return _authenticateX509(txn, user, cmdObj);
+        return _authenticateX509(opCtx, user, cmdObj);
     }
 #endif
     return Status(ErrorCodes::BadValue, "Unsupported mechanism: " + mechanism);
 }
 
-Status CmdAuthenticate::_authenticateCR(OperationContext* txn,
+Status CmdAuthenticate::_authenticateCR(OperationContext* opCtx,
                                         const UserName& user,
                                         const BSONObj& cmdObj) {
     if (user == internalSecurity.user->getName() &&
@@ -265,7 +265,7 @@ Status CmdAuthenticate::_authenticateCR(OperationContext* txn,
     }
 
     User* userObj;
-    Status status = getGlobalAuthorizationManager()->acquireUser(txn, user, &userObj);
+    Status status = getGlobalAuthorizationManager()->acquireUser(opCtx, user, &userObj);
     if (!status.isOK()) {
         // Failure to find the privilege document indicates no-such-user, a fact that we do not
         // wish to reveal to the client.  So, we return AuthenticationFailed rather than passing
@@ -298,7 +298,7 @@ Status CmdAuthenticate::_authenticateCR(OperationContext* txn,
     }
 
     AuthorizationSession* authorizationSession = AuthorizationSession::get(Client::getCurrent());
-    status = authorizationSession->addAndAuthorizeUser(txn, user);
+    status = authorizationSession->addAndAuthorizeUser(opCtx, user);
     if (!status.isOK()) {
         return status;
     }
@@ -307,7 +307,7 @@ Status CmdAuthenticate::_authenticateCR(OperationContext* txn,
 }
 
 #ifdef MONGO_CONFIG_SSL
-Status CmdAuthenticate::_authenticateX509(OperationContext* txn,
+Status CmdAuthenticate::_authenticateX509(OperationContext* opCtx,
                                           const UserName& user,
                                           const BSONObj& cmdObj) {
     if (!getSSLManager()) {
@@ -348,7 +348,7 @@ Status CmdAuthenticate::_authenticateX509(OperationContext* txn,
             if (_isX509AuthDisabled) {
                 return Status(ErrorCodes::BadValue, _x509AuthenticationDisabledMessage);
             }
-            Status status = authorizationSession->addAndAuthorizeUser(txn, user);
+            Status status = authorizationSession->addAndAuthorizeUser(opCtx, user);
             if (!status.isOK()) {
                 return status;
             }
@@ -374,7 +374,7 @@ public:
         return false;
     }
     CmdLogout() : Command("logout") {}
-    bool run(OperationContext* txn,
+    bool run(OperationContext* opCtx,
              const string& dbname,
              BSONObj& cmdObj,
              int options,