From d4da1f59fc947891ae8c8ee8afb9427a4c6fcf4d Mon Sep 17 00:00:00 2001 From: runsisi Date: Fri, 16 Nov 2018 14:56:39 +0800 Subject: [PATCH] mon: require keyring even if cephx is optional Signed-off-by: runsisi --- src/mon/Monitor.cc | 9 ++------- src/mon/Monitor.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index d63c5d5d0992..01c1cc877a08 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -2890,13 +2890,8 @@ void Monitor::format_command_descriptions(const std::vector &command bool Monitor::is_keyring_required() { - string auth_cluster_required = g_conf()->auth_supported.empty() ? - g_conf()->auth_cluster_required : g_conf()->auth_supported; - string auth_service_required = g_conf()->auth_supported.empty() ? - g_conf()->auth_service_required : g_conf()->auth_supported; - - return auth_service_required == "cephx" || - auth_cluster_required == "cephx"; + return auth_cluster_required.is_supported_auth(CEPH_AUTH_CEPHX) || + auth_service_required.is_supported_auth(CEPH_AUTH_CEPHX); } struct C_MgrProxyCommand : public Context { diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 065917139305..3c2685ae45f4 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -976,7 +976,7 @@ public: leader_mon_commands = cmds; } - static bool is_keyring_required(); + bool is_keyring_required(); }; #define CEPH_MON_FEATURE_INCOMPAT_BASE CompatSet::Feature (1, "initial feature set (~v.18)") -- 2.47.3