Revert "SERVER-9518 Make all methods on AuthorizationManager non-static"

This reverts commit 7d37be060bd7db332ebeade1e1c0cf53d8b00cb3.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/mongo/db/repl/oplogreader.cpp b/src/mongo/db/repl/oplogreader.cpp
index 80168a2da0a..092a989e493 100644
--- a/src/mongo/db/repl/oplogreader.cpp
+++ b/src/mongo/db/repl/oplogreader.cpp
@@ -22,7 +22,6 @@
 #include "mongo/base/counter.h"
 #include "mongo/client/dbclientinterface.h"
 #include "mongo/db/auth/authorization_manager.h"
-#include "mongo/db/auth/authorization_manager_global.h"
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands/server_status.h"
 #include "mongo/db/dbhelpers.h"
@@ -51,7 +50,7 @@ namespace mongo {
      * connection will be used for!
      */
     bool replAuthenticate(DBClientBase *conn, bool skipAuthCheck) {
-        if(!getGlobalAuthorizationManager()->isAuthEnabled()) {
+        if(!AuthorizationManager::isAuthEnabled()) {
             return true;
         }
         if (!skipAuthCheck && !cc().getAuthorizationSession()->hasInternalAuthorization()) {
@@ -148,8 +147,7 @@ namespace mongo {
                                                                           30 /* tcp timeout */));
             string errmsg;
             if ( !_conn->connect(hostName.c_str(), errmsg) ||
-                 (getGlobalAuthorizationManager()->isAuthEnabled() &&
-                         !replAuthenticate(_conn.get(), true)) ) {
+                 (AuthorizationManager::isAuthEnabled() && !replAuthenticate(_conn.get(), true)) ) {
                 resetConnection();
                 log() << "repl: " << errmsg << endl;
                 return false;