update sources to 12.2.7

[ceph.git] / ceph / src / mon / Monitor.h

diff --git a/ceph/src/mon/Monitor.h b/ceph/src/mon/Monitor.h
index fc9772601cb9871f4eb3a39d024bab3616d02a56..008947e85be34d2203421f8d12f80e9bc00fd2cd 100644 (file)
--- a/ceph/src/mon/Monitor.h
+++ b/ceph/src/mon/Monitor.h
@@ -650,8 +650,8 @@ public:
     return (class MgrStatMonitor*) paxos_service[PAXOS_MGRSTAT];
   }
 
-  class MgrStatMonitor *healthmon() {
-    return (class MgrStatMonitor*) paxos_service[PAXOS_MGRSTAT];
+  class HealthMonitor *healthmon() {
+    return (class HealthMonitor*) paxos_service[PAXOS_HEALTH];
   }
 
   friend class Paxos;
@@ -906,7 +906,8 @@ public:
   bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer, bool force_new) override;
   bool ms_verify_authorizer(Connection *con, int peer_type,
                            int protocol, bufferlist& authorizer_data, bufferlist& authorizer_reply,
-                           bool& isvalid, CryptoKey& session_key) override;
+                           bool& isvalid, CryptoKey& session_key,
+                           std::unique_ptr<AuthAuthorizerChallenge> *challenge) override;
   bool ms_handle_reset(Connection *con) override;
   void ms_handle_remote_reset(Connection *con) override {}
   bool ms_handle_refused(Connection *con) override;