From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 9 Mar 2021 13:36:39 +0000 (+0100)
Subject: auth/AuthServiceHandler: build_cephx_response_header() is cephx-specific
X-Git-Tag: v14.2.20~13
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0fbb2f8e3fdab3ee7c611aa77f79e14da9bacd66;p=ceph.git

auth/AuthServiceHandler: build_cephx_response_header() is cephx-specific

Make the one in CephxServiceHandler private and drop the stub in
AuthNoneServiceHandler.

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

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

diff --git a/src/auth/cephx/CephxServiceHandler.h b/src/auth/cephx/CephxServiceHandler.h
index b780a18848c65..c27194814c5bb 100644
--- a/src/auth/cephx/CephxServiceHandler.h
+++ b/src/auth/cephx/CephxServiceHandler.h
@@ -41,7 +41,9 @@ public:
     CryptoKey *session_key,
     std::string *connection_secret) override;
 
-  void build_cephx_response_header(int request_type, int status, bufferlist& bl);
+private:
+  void build_cephx_response_header(int request_type, int status,
+				   bufferlist& bl);
 };
 
 #endif
diff --git a/src/auth/none/AuthNoneServiceHandler.h b/src/auth/none/AuthNoneServiceHandler.h
index 5cbcf0cbd65e9..dd8c9d2634462 100644
--- a/src/auth/none/AuthNoneServiceHandler.h
+++ b/src/auth/none/AuthNoneServiceHandler.h
@@ -42,9 +42,6 @@ public:
 		     std::string *connection_secret) override {
     return 0;
   }
-  void build_cephx_response_header(int request_type, int status,
-				   bufferlist& bl) {
-  }
 };
 
 #endif