]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
auth: properly return error of cephx_calc_client_server_challenge
authorYan, Zheng <zyan@redhat.com>
Fri, 20 Mar 2015 04:03:44 +0000 (12:03 +0800)
committerYan, Zheng <zyan@redhat.com>
Fri, 20 Mar 2015 17:05:08 +0000 (01:05 +0800)
Signed-off-by: Yan, Zheng <zyan@redhat.com>
src/auth/cephx/CephxProtocol.cc

index f57f06358644dd53b1710d44445835870cd07c22..f2a00dd75a05d12a2d377c9028b55b7358c9efa3 100644 (file)
 
 
 void cephx_calc_client_server_challenge(CephContext *cct, CryptoKey& secret, uint64_t server_challenge, 
-                 uint64_t client_challenge, uint64_t *key, std::string &ret)
+                 uint64_t client_challenge, uint64_t *key, std::string &error)
 {
   CephXChallengeBlob b;
   b.server_challenge = server_challenge;
   b.client_challenge = client_challenge;
 
   bufferlist enc;
-  std::string error;
   if (encode_encrypt(cct, b, secret, enc, error))
     return;