update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / auth / RotatingKeyRing.cc

diff --git a/ceph/src/auth/RotatingKeyRing.cc b/ceph/src/auth/RotatingKeyRing.cc
index c2d614a1432691663b002526bd8a7237d9c0ac15..4bc6af6adcad369032098e51f3110e33cf4566df 100644 (file)
--- a/ceph/src/auth/RotatingKeyRing.cc
+++ b/ceph/src/auth/RotatingKeyRing.cc
@@ -31,7 +31,7 @@ void RotatingKeyRing::set_secrets(RotatingSecrets&& s)
 void RotatingKeyRing::dump_rotating() const
 {
   ldout(cct, 10) << "dump_rotating:" << dendl;
-  for (map<uint64_t, ExpiringCryptoKey>::const_iterator iter = secrets.secrets.begin();
+  for (auto iter = secrets.secrets.begin();
        iter != secrets.secrets.end();
        ++iter)
     ldout(cct, 10) << " id " << iter->first << " " << iter->second << dendl;
@@ -54,8 +54,7 @@ bool RotatingKeyRing::get_service_secret(uint32_t service_id_, uint64_t secret_i
     return false;
   }
 
-  map<uint64_t, ExpiringCryptoKey>::const_iterator iter =
-    secrets.secrets.find(secret_id);
+  auto iter = secrets.secrets.find(secret_id);
   if (iter == secrets.secrets.end()) {
     ldout(cct, 0) << "could not find secret_id=" << secret_id << dendl;
     dump_rotating();