import ceph 16.2.7

[ceph.git] / ceph / src / auth / cephx / CephxKeyServer.h

diff --git a/ceph/src/auth/cephx/CephxKeyServer.h b/ceph/src/auth/cephx/CephxKeyServer.h
index 3576c42c2357adad37bc1ce804d45558240c51ba..945a7f4dcd8979f64643e6924173c22104c5d687 100644 (file)
--- a/ceph/src/auth/cephx/CephxKeyServer.h
+++ b/ceph/src/auth/cephx/CephxKeyServer.h
@@ -195,8 +195,7 @@ class KeyServer : public KeyStore {
   KeyServerData data;
   mutable ceph::mutex lock;
 
-  int _rotate_secret(uint32_t service_id);
-  bool _check_rotating_secrets();
+  int _rotate_secret(uint32_t service_id, KeyServerData &pending_data);
   void _dump_rotating_secrets();
   int _build_session_auth_info(uint32_t service_id, 
                               const AuthTicket& parent_ticket,
@@ -215,6 +214,8 @@ public:
   int start_server();
   void rotate_timeout(double timeout);
 
+  void dump();
+  
   int build_session_auth_info(uint32_t service_id,
                              const AuthTicket& parent_ticket,
                              CephXSessionAuthInfo& info);
@@ -297,7 +298,7 @@ public:
     }
   }
 
-  bool updated_rotating(ceph::buffer::list& rotating_bl, version_t& rotating_ver);
+  bool prepare_rotating_update(ceph::buffer::list& rotating_bl);
 
   bool get_rotating_encrypted(const EntityName& name, ceph::buffer::list& enc_bl) const;