From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 15 Apr 2021 07:47:50 +0000 (+0200)
Subject: auth/cephx: drop redundant KeyServerData::get_service_secret() overload
X-Git-Tag: v16.2.1~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=80d25431be84070892b012132f49a5840a26ea46;p=ceph.git

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 f983e66b45098..0bfd72033ac0a 100644
--- a/src/auth/cephx/CephxKeyServer.cc
+++ b/src/auth/cephx/CephxKeyServer.cc
@@ -30,7 +30,7 @@ using ceph::bufferlist;
 using ceph::Formatter;
 
 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
 {
   auto iter = rotating_secrets.find(service_id);
   if (iter == rotating_secrets.end()) { 
@@ -49,21 +49,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 c86ccb3efb005..e8d24a3eed106 100644
--- a/src/auth/cephx/CephxKeyServer.h
+++ b/src/auth/cephx/CephxKeyServer.h
@@ -93,8 +93,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,