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/AuthServiceHandler.h [ bufferlist vs
	  ceph::buffer::list ]
	src/auth/cephx/CephxServiceHandler.h [ ditto ]
	src/auth/none/AuthNoneServiceHandler.h [ ditto ]

diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h
index 9f695bfdf973ea8027fe07189b3bcede57e9fa84..e00aac6140478f0e7e69497e85a11d4043be8303 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,
                            bufferlist *result,
-                           AuthCapsInfo *caps,
-                           CryptoKey *session_key,
-                           std::string *connection_secret) = 0;
+                           AuthCapsInfo *caps) = 0;
   virtual int handle_request(bufferlist::const_iterator& indata,
                             size_t connection_secret_required_length,
                             bufferlist *result,

diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc
index 2ab0602e25f61cb56416e34d18aa5be29c60946f..2f070446080f555dd42bece95fa6082e73e87b03 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 d7c0feeb34a0a333d8d3989b99a4a5f00b5ae0e9..26c05cd92ef6bcc8613b3a025325a6019b243aa3 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 038c75e03be9783bcd0b4ce3680ee44d79e92338..5cbcf0cbd65e9f523d145bc791dfd57f51f1b362 100644 (file)
--- a/src/auth/none/AuthNoneServiceHandler.h
+++ b/src/auth/none/AuthNoneServiceHandler.h
@@ -27,11 +27,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 3940da3441d00bcca423c7015365c939b014d950..9537986eddd01c5dc954ffe9f340167de9f7d648 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -711,10 +711,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 968294d79ccb8818625a47c77d7a425c738feb8d..55e13f67c87a427b565d67250ba2ed4d384f12c3 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -6356,11 +6356,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) {