Skip to content

Commit

Permalink
Merge pull request #28740 from smithfarm/wip-40546-nautilus
Browse files Browse the repository at this point in the history
nautilus: common: Keyrings created by ceph auth get are not suitable for ceph auth import

Reviewed-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
yuriw committed Aug 1, 2019
2 parents 0caf2e8 + 886bc94 commit bb8eaa8
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/auth/KeyRing.cc
Expand Up @@ -17,6 +17,7 @@
#include <memory>
#include <sstream>
#include <algorithm>
#include <boost/algorithm/string/replace.hpp>
#include "auth/KeyRing.h"
#include "common/ceph_context.h"
#include "common/config.h"
Expand Down Expand Up @@ -255,6 +256,7 @@ void KeyRing::print(ostream& out)
string caps;
using ceph::decode;
decode(caps, dataiter);
boost::replace_all(caps, "\"", "\\\"");
out << "\tcaps " << q->first << " = \"" << caps << '"' << std::endl;
}
}
Expand Down

0 comments on commit bb8eaa8

Please sign in to comment.