auth/AuthServiceHandler: drop unused start_session() args

idryomov · liewegas · commit c151c9659bdb · 2021-04-06T17:28:54.000-04:00
session_key, connection_secret and connection_secret_required_length
aren't material for start_session() across all three implementations.

Signed-off-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h
@@ -37,11 +37,8 @@ struct AuthServiceHandler {
   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
@@ -37,11 +37,8 @@ using ceph::encode;
 
 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
@@ -30,11 +30,8 @@ class CephxServiceHandler  : public AuthServiceHandler {
   ~CephxServiceHandler() override {}
   
   int start_session(const EntityName& name,
-		    size_t connection_secret_required_length,
 		    ceph::buffer::list *result_bl,
-		    AuthCapsInfo *caps,
-		    CryptoKey *session_key,
-		    std::string *connection_secret) override;
+		    AuthCapsInfo *caps) override;
   int handle_request(
     ceph::buffer::list::const_iterator& indata,
     size_t connection_secret_required_length,
diff --git 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
@@ -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
@@ -26,11 +26,8 @@ class AuthNoneServiceHandler  : public AuthServiceHandler {
   ~AuthNoneServiceHandler() override {}
   
   int start_session(const EntityName& name,
-		    size_t connection_secret_required_length,
 		    ceph::buffer::list *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
@@ -740,10 +740,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
@@ -6381,11 +6381,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) {
