]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
auth: add display auid to KeyRing::encode_formatted
authorLoic Dachary <loic-201408@dachary.org>
Wed, 15 Oct 2014 18:07:19 +0000 (11:07 -0700)
committerLoic Dachary <loic-201408@dachary.org>
Wed, 15 Oct 2014 18:07:19 +0000 (11:07 -0700)
http://tracker.ceph.com/issues/9790 Fixes: #9790

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
src/auth/KeyRing.cc

index 96e56cd487e2169374e46fb50090aaa614d3486b..7aeb9e833a06f4bf8a558ba689f0305310ce2b9d 100644 (file)
@@ -145,6 +145,8 @@ void KeyRing::encode_formatted(string label, Formatter *f, bufferlist& bl)
     std::ostringstream keyss;
     keyss << p->second.key;
     f->dump_string("key", keyss.str());
+    if (p->second.auid != CEPH_AUTH_UID_DEFAULT)
+      f->dump_int("auid", p->second.auid);
     f->open_object_section("caps");
     for (map<string, bufferlist>::iterator q = p->second.caps.begin();
         q != p->second.caps.end();