From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 9 Apr 2014 21:12:58 +0000 (-0700)
Subject: auth: make AuthClientHandler::validate_ticket() protected
X-Git-Tag: v0.80-rc1~70^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b297689abf6d24851474e90aa4815e043594957a;p=ceph.git

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 8d8289340f12..39fee665e052 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 e99e0930b518..d200ac990dcf 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 c2aae4a54a93..203687e4012f 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 f87a26b96137..088b816cb5b9 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