From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 20 Mar 2015 04:03:44 +0000 (+0800)
Subject: auth: properly return error of cephx_calc_client_server_challenge
X-Git-Tag: v9.0.0~131^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f183cd7c219c1292ae4a70394631435d06e3cd9b;p=ceph.git

auth: properly return error of cephx_calc_client_server_challenge

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/auth/cephx/CephxProtocol.cc b/src/auth/cephx/CephxProtocol.cc
index f57f06358644..f2a00dd75a05 100644
--- a/src/auth/cephx/CephxProtocol.cc
+++ b/src/auth/cephx/CephxProtocol.cc
@@ -25,14 +25,13 @@
 
 
 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;