]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon/AuthMonitor: include pending_key in 'auth get-or-create' result
authorSage Weil <sage@newdream.net>
Mon, 25 Oct 2021 19:59:25 +0000 (15:59 -0400)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Mon, 12 Sep 2022 17:03:17 +0000 (17:03 +0000)
Signed-off-by: Sage Weil <sage@newdream.net>
src/mon/AuthMonitor.cc

index e103620b9f2c77dc1aa708f822ed3f3c5bdfcdb3..aefdb5dd3f8ac0e67abcf56b16474ba5fcb2dee5 100644 (file)
@@ -932,11 +932,11 @@ bool AuthMonitor::preprocess_command(MonOpRequestRef op)
   } else if (prefix == "auth get" && !entity_name.empty()) {
     KeyRing keyring;
     EntityAuth entity_auth;
-    if(!mon.key_server.get_auth(entity, entity_auth)) {
+    if (!mon.key_server.get_auth(entity, entity_auth)) {
       ss << "failed to find " << entity_name << " in keyring";
       r = -ENOENT;
     } else {
-      keyring.add(entity, entity_auth);
+      keyring.add(entity, entity_auth.key, entity_auth.pending_key);
       if (f)
        keyring.encode_formatted("auth", f.get(), rdata);
       else
@@ -1690,7 +1690,7 @@ bool AuthMonitor::prepare_command(MonOpRequestRef op)
         }
       } else {
        KeyRing kr;
-       kr.add(entity, entity_auth.key);
+       kr.add(entity, entity_auth.key, entity_auth.pending_key);
         if (f) {
           kr.set_caps(entity, entity_auth.caps);
           kr.encode_formatted("auth", f.get(), rdata);