auth/AuthRegistry: clear output vectors

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/auth/AuthRegistry.cc b/src/auth/AuthRegistry.cc
index f89868cbfa5b341316845b10be6fc05c42693fb0..f10271800dace28d8ebc0fb1ef0f0a05cb7eac32 100644 (file)
--- a/src/auth/AuthRegistry.cc
+++ b/src/auth/AuthRegistry.cc
@@ -46,6 +46,7 @@ void AuthRegistry::_parse_method_list(const string& s,
   if (sup_list.empty()) {
     lderr(cct) << "WARNING: empty auth protocol list" << dendl;
   }
+  v->clear();
   for (auto& i : sup_list) {
     ldout(cct, 5) << "adding auth protocol: " << i << dendl;
     if (i == "cephx") {
@@ -72,6 +73,7 @@ void AuthRegistry::_parse_mode_list(const string& s,
   if (sup_list.empty()) {
     lderr(cct) << "WARNING: empty auth protocol list" << dendl;
   }
+  v->clear();
   for (auto& i : sup_list) {
     ldout(cct, 5) << "adding con mode: " << i << dendl;
     if (i == "crc") {
@@ -158,6 +160,12 @@ void AuthRegistry::get_supported_methods(
   std::vector<uint32_t> *methods,
   std::vector<uint32_t> *modes)
 {
+  if (methods) {
+    methods->clear();
+  }
+  if (modes) {
+    modes->clear();
+  }
   std::scoped_lock l(lock);
   switch (cct->get_module_type()) {
   case CEPH_ENTITY_TYPE_CLIENT:
@@ -248,6 +256,7 @@ void AuthRegistry::get_supported_modes(
   get_supported_methods(peer_type, nullptr, &s);
   if (auth_method == CEPH_AUTH_NONE) {
     // filter out all but crc for AUTH_NONE
+    modes->clear();
     for (auto mode : s) {
       if (mode == CEPH_CON_MODE_CRC) {
        modes->push_back(mode);