Imported Upstream version 2.6.11upstream/2.6.11

1 files changed, 21 insertions, 9 deletions

diff --git a/src/mongo/db/client_basic.cpp b/src/mongo/db/client_basic.cpp
index 33185b5aae1..d3b06557df8 100644
--- a/src/mongo/db/client_basic.cpp
+++ b/src/mongo/db/client_basic.cpp
@@ -12,12 +12,24 @@
 *
 *    You should have received a copy of the GNU Affero General Public License
 *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*    As a special exception, the copyright holders give permission to link the
+*    code of portions of this program with the OpenSSL library under certain
+*    conditions as described in each individual source file and distribute
+*    linked combinations including the program with the OpenSSL library. You
+*    must comply with the GNU Affero General Public License in all respects for
+*    all of the code used other than as permitted herein. If you modify file(s)
+*    with this exception, you may extend this exception to your version of the
+*    file(s), but you are not obligated to do so. If you do not wish to do so,
+*    delete this exception statement from your version. If you delete this
+*    exception statement from all source files in the program, then also delete
+*    it in the license file.
 */
 
 #include "mongo/db/client_basic.h"
 
 #include "mongo/db/auth/authentication_session.h"
-#include "mongo/db/auth/authorization_manager.h"
+#include "mongo/db/auth/authorization_session.h"
 
 namespace mongo {
 
@@ -41,22 +53,22 @@ namespace mongo {
         _authenticationSession.swap(other);
     }
 
-    bool ClientBasic::hasAuthorizationManager() const {
-        return _authorizationManager.get();
+    bool ClientBasic::hasAuthorizationSession() const {
+        return _authorizationSession.get();
     }
 
-    AuthorizationManager* ClientBasic::getAuthorizationManager() const {
+    AuthorizationSession* ClientBasic::getAuthorizationSession() const {
             massert(16481,
                     "No AuthorizationManager has been set up for this connection",
-                    hasAuthorizationManager());
-            return _authorizationManager.get();
+                    hasAuthorizationSession());
+            return _authorizationSession.get();
     }
 
-    void ClientBasic::setAuthorizationManager(AuthorizationManager* authorizationManager) {
+    void ClientBasic::setAuthorizationSession(AuthorizationSession* authorizationSession) {
         massert(16477,
                 "An AuthorizationManager has already been set up for this connection",
-                !hasAuthorizationManager());
-        _authorizationManager.reset(authorizationManager);
+                !hasAuthorizationSession());
+        _authorizationSession.reset(authorizationSession);
     }
 
 }  // namespace mongo