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 b780a18848c65b9cc4ccf407f01fa02d9020624b..c27194814c5bb66529e85fc2741aeddc073300bd 100644 (file)
--- 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 5cbcf0cbd65e9f523d145bc791dfd57f51f1b362..dd8c9d26344623a16fdc6892dc9066108958c1d9 100644 (file)
--- 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