From b297689abf6d24851474e90aa4815e043594957a Mon Sep 17 00:00:00 2001
From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 9 Apr 2014 14:12:58 -0700
Subject: [PATCH] auth: make AuthClientHandler::validate_ticket() protected

It's just used internally. Make it private in the subclasses since
there's just one level of inheritance.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---
 src/auth/AuthClientHandler.h                | 4 ++--
 src/auth/cephx/CephxClientHandler.h         | 3 ++-
 src/auth/none/AuthNoneClientHandler.h       | 3 ++-
 src/auth/unknown/AuthUnknownClientHandler.h | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/auth/AuthClientHandler.h b/src/auth/AuthClientHandler.h
index 8d8289340f12d..39fee665e052a 100644
--- a/src/auth/AuthClientHandler.h
+++ b/src/auth/AuthClientHandler.h
@@ -68,12 +68,12 @@ public:
 
   virtual AuthAuthorizer *build_authorizer(uint32_t service_id) const = 0;
 
-
-  virtual void validate_tickets() = 0;
   virtual bool need_tickets() = 0;
 
   virtual void set_global_id(uint64_t id) = 0;
   uint64_t get_global_id() { return global_id; }
+protected:
+  virtual void validate_tickets() = 0;
 };
 
 
diff --git a/src/auth/cephx/CephxClientHandler.h b/src/auth/cephx/CephxClientHandler.h
index e99e0930b5184..d200ac990dcf1 100644
--- a/src/auth/cephx/CephxClientHandler.h
+++ b/src/auth/cephx/CephxClientHandler.h
@@ -59,7 +59,6 @@ public:
 
   AuthAuthorizer *build_authorizer(uint32_t service_id) const;
 
-  void validate_tickets();
   bool need_tickets();
 
   void set_global_id(uint64_t id) {
@@ -67,6 +66,8 @@ public:
     global_id = id;
     tickets.global_id = id;
   }
+private:
+  void validate_tickets();
 };
 
 #endif
diff --git a/src/auth/none/AuthNoneClientHandler.h b/src/auth/none/AuthNoneClientHandler.h
index c2aae4a54a93e..203687e4012fb 100644
--- a/src/auth/none/AuthNoneClientHandler.h
+++ b/src/auth/none/AuthNoneClientHandler.h
@@ -43,13 +43,14 @@ public:
     return auth;
   }
 
-  void validate_tickets() { }
   bool need_tickets() { return false; }
 
   void set_global_id(uint64_t id) {
     RWLock::WLocker l(lock);
     global_id = id;
   }
+private:
+  void validate_tickets() {}
 };
 
 #endif
diff --git a/src/auth/unknown/AuthUnknownClientHandler.h b/src/auth/unknown/AuthUnknownClientHandler.h
index f87a26b961379..088b816cb5b9c 100644
--- a/src/auth/unknown/AuthUnknownClientHandler.h
+++ b/src/auth/unknown/AuthUnknownClientHandler.h
@@ -43,13 +43,14 @@ public:
     return auth;
   }
 
-  void validate_tickets() { }
   bool need_tickets() { return false; }
 
   void set_global_id(uint64_t id) {
     RWLock::WLocker l(lock);
     global_id = id;
   }
+private:
+  void validate_tickets() { }
 };
 
 #endif
-- 
2.39.5