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>

diff --git a/src/auth/AuthClientHandler.h b/src/auth/AuthClientHandler.h
index 8d8289340f12d9512c9e43069eb159ad6f849684..39fee665e052a79013e7dde56c102932f56b30e7 100644 (file)
--- 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 e99e0930b51842dc7bdca97fc300da9b8bae7bab..d200ac990dcf120c7a9891b6a063438077336000 100644 (file)
--- 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 c2aae4a54a93eddff334a1ca12afd54337ef442c..203687e4012fb2a046639216bbed528c35f55b81 100644 (file)
--- 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 f87a26b9613793a59dc4756a42fc94af4ad5c086..088b816cb5b9ca6f2a4c37ceb16f1ca2ab50ed24 100644 (file)
--- 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