From: Sage Weil <sage@redhat.com>
Date: Tue, 2 Jul 2019 23:02:03 +0000 (-0500)
Subject: auth/cephx/CephxKeyServer: make clear_secrets() clear rotating secrets too
X-Git-Tag: v13.2.7~157^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43d56085ea1db7ec097e140cbd9dabbc272012f7;p=ceph.git

auth/cephx/CephxKeyServer: make clear_secrets() clear rotating secrets too

Clear the rotating secrets.  And also reset the versions.

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

diff --git a/src/auth/cephx/CephxKeyServer.h b/src/auth/cephx/CephxKeyServer.h
index 896e6e770eae..4f9f2d9a677a 100644
--- a/src/auth/cephx/CephxKeyServer.h
+++ b/src/auth/cephx/CephxKeyServer.h
@@ -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) {