mon: cleanup for loop

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

diff --git a/src/auth/cephx/CephxKeyServer.h b/src/auth/cephx/CephxKeyServer.h
index a4ea05e45a846df48c157af409d006ed8f5629d1..24d38fce9006ec614b3bb077c15ff30a093e8508 100644 (file)
--- a/src/auth/cephx/CephxKeyServer.h
+++ b/src/auth/cephx/CephxKeyServer.h
@@ -141,6 +141,7 @@ struct KeyServerData {
   bool get_caps(CephContext *cct, const EntityName& name,
                const std::string& type, AuthCapsInfo& caps) const;
 
+  auto const& get_secrets() const { return secrets; }
   std::map<EntityName, EntityAuth>::iterator secrets_begin()
   { return secrets.begin(); }
   std::map<EntityName, EntityAuth>::const_iterator secrets_begin() const 

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 5e245f50bcedad3758ba9839fcb20cbfbe6ca6ef..e5282f0cd36a04a6d75319a17ba6ebdb0243c9d7 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -470,15 +470,13 @@ void AuthMonitor::encode_pending(MonitorDBStore::TransactionRef t)
   // health
   auto& next = get_health_checks_pending_writeable();
   map<string,list<string>> bad_detail;  // entity -> details
-  for (auto i = mon.key_server.secrets_begin();
-       i != mon.key_server.secrets_end();
-       ++i) {
-    for (auto& p : i->second.caps) {
+  for (auto const& [entity, auth] : mon.key_server.get_secrets()) {
+    for (auto& p : auth.caps) {
       ostringstream ss;
       if (!valid_caps(p.first, p.second, &ss)) {
        ostringstream ss2;
-       ss2 << i->first << " " << ss.str();
-       bad_detail[i->first.to_str()].push_back(ss2.str());
+       ss2 << entity << " " << ss.str();
+       bad_detail[entity.to_str()].push_back(ss2.str());
       }
     }
   }