From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 29 Jun 2017 18:54:40 +0000 (-0400)
Subject: rbd: do not attempt to load key if auth is disabled
X-Git-Tag: v12.1.1~184^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16024%2Fhead;p=ceph.git

rbd: do not attempt to load key if auth is disabled

Fixes: http://tracker.ceph.com/issues/19035
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/krbd.cc b/src/krbd.cc
index bf7e25583691..4f8b671b429a 100644
--- a/src/krbd.cc
+++ b/src/krbd.cc
@@ -133,13 +133,15 @@ static int build_map_buf(CephContext *cct, const char *pool, const char *image,
   oss << " name=" << cct->_conf->name.get_id();
 
   KeyRing keyring;
-  r = keyring.from_ceph_context(cct);
-  if (r == -ENOENT && !(cct->_conf->keyfile.length() ||
-                        cct->_conf->key.length()))
-    r = 0;
-  if (r < 0) {
-    cerr << "rbd: failed to get secret" << std::endl;
-    return r;
+  if (cct->_conf->auth_client_required != "none") {
+    r = keyring.from_ceph_context(cct);
+    if (r == -ENOENT && !(cct->_conf->keyfile.length() ||
+                          cct->_conf->key.length()))
+      r = 0;
+    if (r < 0) {
+      cerr << "rbd: failed to get secret" << std::endl;
+      return r;
+    }
   }
 
   CryptoKey secret;