update sources to v12.1.1

[ceph.git] / ceph / src / krbd.cc

diff --git a/ceph/src/krbd.cc b/ceph/src/krbd.cc
index bf7e25583691835a3525194e41b9887e168f82b5..4f8b671b429acc35cd0b45df0f10413774b08406 100644 (file)
--- a/ceph/src/krbd.cc
+++ b/ceph/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;