From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 7 Jun 2016 01:28:50 +0000 (+0800)
Subject: auth/cephx: kill dead code
X-Git-Tag: ses5-milestone5~239^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8af5f75a44923ac25fdbf968e66c8c0c5e199d5;p=ceph.git

auth/cephx: kill dead code

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/auth/AuthClientHandler.h b/src/auth/AuthClientHandler.h
index 0bebb74c447f..69fbd6aeadee 100644
--- a/src/auth/AuthClientHandler.h
+++ b/src/auth/AuthClientHandler.h
@@ -47,11 +47,6 @@ public:
     want = keys | CEPH_ENTITY_TYPE_AUTH;
     validate_tickets();
   }
-  void add_want_keys(__u32 keys) {
-    RWLock::WLocker l(lock);
-    want |= keys;
-    validate_tickets();
-  }   
 
   virtual int get_protocol() const = 0;
 
diff --git a/src/auth/cephx/CephxKeyServer.h b/src/auth/cephx/CephxKeyServer.h
index b742f052f527..8e1bd183dcd5 100644
--- a/src/auth/cephx/CephxKeyServer.h
+++ b/src/auth/cephx/CephxKeyServer.h
@@ -273,11 +273,6 @@ public:
     return data.secrets.size();
   }
 
-  /*void add_rotating_secret(uint32_t service_id, ExpiringCryptoKey& key) {
-    Mutex::Locker l(lock);
-    data.add_rotating_secret(service_id, key);
-  }
-  */
   void clone_to(KeyServerData& dst) const {
     Mutex::Locker l(lock);
     dst = data;
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 4e08ceb6d6c0..2c7051bdb183 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -382,12 +382,6 @@ public:
       auth->set_want_keys(want | CEPH_ENTITY_TYPE_MON);
   }
 
-  void add_want_keys(uint32_t want) {
-    want_keys |= want;
-    if (auth)
-      auth->add_want_keys(want);
-  }
-
   // admin commands
 private:
   uint64_t last_mon_command_tid;