]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
auth/cephx/CephxKeyServer: make clear_secrets() clear rotating secrets too
authorSage Weil <sage@redhat.com>
Tue, 2 Jul 2019 23:02:03 +0000 (18:02 -0500)
committerNathan Cutler <ncutler@suse.com>
Thu, 5 Sep 2019 12:48:08 +0000 (14:48 +0200)
Clear the rotating secrets.  And also reset the versions.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e1600b145277da0ed545aac2e106036ba4f1686c)

src/auth/cephx/CephxKeyServer.h

index 896e6e770eaeb809f3b5aede4f5c714262f5cf8d..4f9f2d9a677a1a038be78cdb116f8a95ff9adfae 100644 (file)
@@ -78,7 +78,10 @@ struct KeyServerData {
   }
 
   void clear_secrets() {
+    version = 0;
     secrets.clear();
+    rotating_ver = 0;
+    rotating_secrets.clear();
   }
 
   void add_auth(const EntityName& name, EntityAuth& auth) {