auth/cephx: drop redundant KeyServerData::get_service_secret() overload

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 3078af716505ae754723864786a41a6d6af0534c)

diff --git a/src/auth/cephx/CephxKeyServer.cc b/src/auth/cephx/CephxKeyServer.cc
index ec9fe99038264dd1255577f295b5646c59824ee4..dccee44d9a7dfb6e6983f25f0351b8408b43b2c8 100644 (file)
--- a/src/auth/cephx/CephxKeyServer.cc
+++ b/src/auth/cephx/CephxKeyServer.cc
@@ -22,7 +22,7 @@
 #define dout_prefix *_dout << "cephx keyserverdata: "
 
 bool KeyServerData::get_service_secret(CephContext *cct, uint32_t service_id,
-                           ExpiringCryptoKey& secret, uint64_t& secret_id) const
+                                      CryptoKey& secret, uint64_t& secret_id) const
 {
   map<uint32_t, RotatingSecrets>::const_iterator iter =
        rotating_secrets.find(service_id);
@@ -43,21 +43,11 @@ bool KeyServerData::get_service_secret(CephContext *cct, uint32_t service_id,
     ++riter;   // "current" key has expired, use "next" key instead
 
   secret_id = riter->first;
-  secret = riter->second;
-  ldout(cct, 30) << "get_service_secret service " << ceph_entity_type_name(service_id)
-          << " id " << secret_id << " " << secret << dendl;
-  return true;
-}
-
-bool KeyServerData::get_service_secret(CephContext *cct, uint32_t service_id,
-                               CryptoKey& secret, uint64_t& secret_id) const
-{
-  ExpiringCryptoKey e;
-
-  if (!get_service_secret(cct, service_id, e, secret_id))
-    return false;
+  secret = riter->second.key;
 
-  secret = e.key;
+  ldout(cct, 30) << __func__ << " service "
+                << ceph_entity_type_name(service_id) << " secret_id "
+                << secret_id << " " << riter->second << dendl;
   return true;
 }
 

diff --git a/src/auth/cephx/CephxKeyServer.h b/src/auth/cephx/CephxKeyServer.h
index cd3cf1234678fc7f2893fb2a03a47c4c45973446..2a342e30302aaec321bb4f27c7a4c453b2801fea 100644 (file)
--- a/src/auth/cephx/CephxKeyServer.h
+++ b/src/auth/cephx/CephxKeyServer.h
@@ -95,8 +95,6 @@ struct KeyServerData {
     secrets.erase(iter);
   }
 
-  bool get_service_secret(CephContext *cct, uint32_t service_id,
-                         ExpiringCryptoKey& secret, uint64_t& secret_id) const;
   bool get_service_secret(CephContext *cct, uint32_t service_id,
                          CryptoKey& secret, uint64_t& secret_id) const;
   bool get_service_secret(CephContext *cct, uint32_t service_id,