auth/AuthServiceHandler: drop unused start_session() args

session_key, connection_secret and connection_secret_required_length
aren't material for start_session() across all three implementations.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit c151c9659bdb71f30b520bbd62f91cc009ec51cd)

Conflicts:
	src/auth/cephx/CephxServiceHandler.h [ bufferlist vs
	  ceph::buffer::list ]
	src/auth/none/AuthNoneServiceHandler.h [ ditto ]

diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h
index ac33eaa2425946eda980342eb811cf3a4b7e8c65..a6dfe019817d14b61827993150539eb99351ad4e 100644 (file)
--- a/src/auth/AuthServiceHandler.h
+++ b/src/auth/AuthServiceHandler.h
@@ -37,11 +37,8 @@ public:
   virtual ~AuthServiceHandler() { }
 
   virtual int start_session(const EntityName& name,
-                           size_t connection_secret_required_length,
                            ceph::buffer::list *result,
-                           AuthCapsInfo *caps,
-                           CryptoKey *session_key,
-                           std::string *connection_secret) = 0;
+                           AuthCapsInfo *caps) = 0;
   virtual int handle_request(ceph::buffer::list::const_iterator& indata,
                             size_t connection_secret_required_length,
                             ceph::buffer::list *result,

diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc
index 867621a861a82bfe35ec4d40bd9765ec7f9e5923..051ca61ae49b25fa56ae6a5dd451b7cd2ecfe464 100644 (file)
--- a/src/auth/cephx/CephxServiceHandler.cc
+++ b/src/auth/cephx/CephxServiceHandler.cc
@@ -29,11 +29,8 @@
 
 int CephxServiceHandler::start_session(
   const EntityName& name,
-  size_t connection_secret_required_length,
   bufferlist *result_bl,
-  AuthCapsInfo *caps,
-  CryptoKey *session_key,
-  std::string *connection_secret)
+  AuthCapsInfo *caps)
 {
   entity_name = name;
 

diff --git a/src/auth/cephx/CephxServiceHandler.h b/src/auth/cephx/CephxServiceHandler.h
index cb598fc870a97c70a7cc8c05b718cca8bb4b967a..b780a18848c65b9cc4ccf407f01fa02d9020624b 100644 (file)
--- a/src/auth/cephx/CephxServiceHandler.h
+++ b/src/auth/cephx/CephxServiceHandler.h
@@ -30,11 +30,8 @@ public:
   ~CephxServiceHandler() override {}
   
   int start_session(const EntityName& name,
-                   size_t connection_secret_required_length,
                    bufferlist *result_bl,
-                   AuthCapsInfo *caps,
-                   CryptoKey *session_key,
-                   std::string *connection_secret) override;
+                   AuthCapsInfo *caps) override;
   int handle_request(
     bufferlist::const_iterator& indata,
     size_t connection_secret_required_length,

diff --git a/src/auth/krb/KrbServiceHandler.cpp b/src/auth/krb/KrbServiceHandler.cpp
index 3bd679d0ab5f489caea3fdbb60f59915e5f3880f..be1510cd621af10226c015654e7c83737beb452e 100644 (file)
--- a/src/auth/krb/KrbServiceHandler.cpp
+++ b/src/auth/krb/KrbServiceHandler.cpp
@@ -154,11 +154,8 @@ int KrbServiceHandler::handle_request(
 
 int KrbServiceHandler::start_session(
   const EntityName& name,
-  size_t connection_secret_required_length,
   bufferlist *buff_list,
-  AuthCapsInfo *caps,
-  CryptoKey *session_key,
-  std::string *connection_secret)
+  AuthCapsInfo *caps)
 {
   gss_buffer_desc gss_buffer_in = {0, nullptr};
   gss_OID gss_object_id = GSS_C_NT_HOSTBASED_SERVICE;

diff --git a/src/auth/krb/KrbServiceHandler.hpp b/src/auth/krb/KrbServiceHandler.hpp
index 672efc54638bd5096266a6f39dc512af7ee4ab88..c1179cc3f0cd2af59b5ef9200d645a44e044136e 100644 (file)
--- a/src/auth/krb/KrbServiceHandler.hpp
+++ b/src/auth/krb/KrbServiceHandler.hpp
@@ -46,11 +46,8 @@ class KrbServiceHandler : public AuthServiceHandler {
                       std::string *connection_secret) override;
 
     int start_session(const EntityName& name,
-                     size_t connection_secret_required_length,
                      bufferlist *buff_list,
-                      AuthCapsInfo *caps,
-                     CryptoKey *session_key,
-                     std::string *connection_secret) override;
+                      AuthCapsInfo *caps) override;
 
   private:
     gss_buffer_desc m_gss_buffer_out;

diff --git a/src/auth/none/AuthNoneServiceHandler.h b/src/auth/none/AuthNoneServiceHandler.h
index d8cc13ae5983ea2dc738104a5112ddc09e2c617d..d206ee987df0e7fc080a596db685b6db675a6d21 100644 (file)
--- a/src/auth/none/AuthNoneServiceHandler.h
+++ b/src/auth/none/AuthNoneServiceHandler.h
@@ -26,11 +26,8 @@ public:
   ~AuthNoneServiceHandler() override {}
   
   int start_session(const EntityName& name,
-                   size_t connection_secret_required_length,
                    bufferlist *result_bl,
-                   AuthCapsInfo *caps,
-                   CryptoKey *session_key,
-                   std::string *connection_secret) override {
+                   AuthCapsInfo *caps) override {
     entity_name = name;
     caps->allow_all = true;
     return 1;

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index a2ed644cdb23bbf05dfa45f3e8e83f6bf6ced8b4..19b0461a44fcb6357703e3607776edaf2ca77897 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -713,10 +713,8 @@ bool AuthMonitor::prep_auth(MonOpRequestRef op, bool paxos_writable)
     if (start) {
       // new session
       ret = s->auth_handler->start_session(entity_name,
-                                          0, // no connection_secret needed
                                           &response_bl,
-                                          &s->con->peer_caps_info,
-                                          nullptr, nullptr);
+                                          &s->con->peer_caps_info);
     } else {
       // request
       ret = s->auth_handler->handle_request(

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index f1e4c257db47fef5dbfe2250b37e7191210b6e09..52b494b69319602660d334507845a9f4b3975af1 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -6269,11 +6269,8 @@ int Monitor::handle_auth_request(
 
     r = s->auth_handler->start_session(
       entity_name,
-      auth_meta->get_connection_secret_length(),
       reply,
-      &con->peer_caps_info,
-      &auth_meta->session_key,
-      &auth_meta->connection_secret);
+      &con->peer_caps_info);
   } else {
     priv = con->get_priv();
     if (!priv) {