From 9fc4dc1f4f7989aedfee3469d54f7a56d77bb637 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 25 Oct 2021 15:59:25 -0400 Subject: [PATCH] mon/AuthMonitor: include pending_key in 'auth get-or-create' result Signed-off-by: Sage Weil --- src/mon/AuthMonitor.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index e103620b9f2..aefdb5dd3f8 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -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); -- 2.39.5