auth: constify bufferlist arg to AuthAuthorizer::add_challenge()

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/auth/Auth.h b/src/auth/Auth.h
index 307afdd9cfbec68402b9b6eb99ba2eabd16ffca6..dc91854ded5e494696743077068737263ada2660 100644 (file)
--- a/src/auth/Auth.h
+++ b/src/auth/Auth.h
@@ -141,7 +141,7 @@ struct AuthAuthorizer {
   virtual ~AuthAuthorizer() {}
   virtual bool verify_reply(bufferlist::const_iterator& reply,
                            CryptoKey *connection_secret) = 0;
-  virtual bool add_challenge(CephContext *cct, bufferlist& challenge) = 0;
+  virtual bool add_challenge(CephContext *cct, const bufferlist& challenge) = 0;
 };
 
 struct AuthAuthorizerChallenge {

diff --git a/src/auth/cephx/CephxProtocol.cc b/src/auth/cephx/CephxProtocol.cc
index eca2a1e9b83263da033fa4d41a56edfbf0f6bf37..45df032a8229b9c4edf0027ecaf7a2036f1dd676 100644 (file)
--- a/src/auth/cephx/CephxProtocol.cc
+++ b/src/auth/cephx/CephxProtocol.cc
@@ -540,7 +540,8 @@ bool CephXAuthorizer::verify_reply(bufferlist::const_iterator& indata,
   return true;
 }
 
-bool CephXAuthorizer::add_challenge(CephContext *cct, bufferlist& challenge)
+bool CephXAuthorizer::add_challenge(CephContext *cct,
+                                   const bufferlist& challenge)
 {
   bl = base_bl;
 

diff --git a/src/auth/cephx/CephxProtocol.h b/src/auth/cephx/CephxProtocol.h
index 49793b59a88ba0f589c8e29a1d31131928e7ef5f..c028244fbcffc67b70c4d8d4bb2ad5597c8ccced 100644 (file)
--- a/src/auth/cephx/CephxProtocol.h
+++ b/src/auth/cephx/CephxProtocol.h
@@ -260,7 +260,7 @@ public:
   bool build_authorizer();
   bool verify_reply(bufferlist::const_iterator& reply,
                    CryptoKey *connection_secret) override;
-  bool add_challenge(CephContext *cct, bufferlist& challenge) override;
+  bool add_challenge(CephContext *cct, const bufferlist& challenge) override;
 };
 
 
@@ -441,7 +441,8 @@ extern bool cephx_verify_authorizer(
 static constexpr uint64_t AUTH_ENC_MAGIC = 0xff009cad8826aa55ull;
 
 template <typename T>
-void decode_decrypt_enc_bl(CephContext *cct, T& t, CryptoKey key, bufferlist& bl_enc, 
+void decode_decrypt_enc_bl(CephContext *cct, T& t, CryptoKey key,
+                          const bufferlist& bl_enc,
                           std::string &error)
 {
   uint64_t magic;

diff --git a/src/auth/krb/KrbProtocol.hpp b/src/auth/krb/KrbProtocol.hpp
index 5b91d153869106b7205fd3316bea300940dbf4b8..780f66e9b039244038874585ce115378ff283533 100644 (file)
--- a/src/auth/krb/KrbProtocol.hpp
+++ b/src/auth/krb/KrbProtocol.hpp
@@ -90,7 +90,7 @@ class KrbAuthorizer : public AuthAuthorizer {
       return true; 
     }
     bool add_challenge(CephContext* ceph_ctx, 
-                       bufferlist& buff_list) override { 
+                       const bufferlist& buff_list) override {
       return true; 
     }
 };

diff --git a/src/auth/none/AuthNoneProtocol.h b/src/auth/none/AuthNoneProtocol.h
index d5c2677a6810c7678f84236a53b3f30899000cfd..155a8d0530464b2c9c832b69e61b23dcdf7c6d46 100644 (file)
--- a/src/auth/none/AuthNoneProtocol.h
+++ b/src/auth/none/AuthNoneProtocol.h
@@ -30,7 +30,9 @@ struct AuthNoneAuthorizer : public AuthAuthorizer {
   }
   bool verify_reply(bufferlist::const_iterator& reply,
                    CryptoKey *connection_secret) override { return true; }
-  bool add_challenge(CephContext *cct, bufferlist& ch) override { return true; }
+  bool add_challenge(CephContext *cct, const bufferlist& ch) override {
+    return true;
+  }
 };
 
 #endif