From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Sep 2018 19:05:08 +0000 (-0500)
Subject: mon: expose keyring for msgr1 authentication
X-Git-Tag: v14.0.1~26^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cdb5b9da3f6451c9457e50eed02b0817bbb8ec91;p=ceph.git

mon: expose keyring for msgr1 authentication

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 76ee7b1911a4..484659e711fd 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -5799,6 +5799,11 @@ bool Monitor::ms_verify_authorizer(Connection *con, int peer_type,
   return true;
 }
 
+KeyStore *Monitor::ms_get_auth1_authorizer_keystore()
+{
+  return &keyring;
+}
+
 int Monitor::ms_handle_authentication(Connection *con)
 {
   auto priv = con->get_priv();
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 266b2ac9fb9f..1c4f36f8e249 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -888,6 +888,7 @@ public:
 			    int protocol, bufferlist& authorizer_data, bufferlist& authorizer_reply,
 			    bool& isvalid, CryptoKey& session_key,
 			    std::unique_ptr<AuthAuthorizerChallenge> *challenge) override;
+  KeyStore *ms_get_auth1_authorizer_keystore();
 public: // for AuthMonitor msgr1:
   int ms_handle_authentication(Connection *con) override;
 private: