From: Loic Dachary <loic-201408@dachary.org>
Date: Wed, 15 Oct 2014 18:07:19 +0000 (-0700)
Subject: auth: add display auid to KeyRing::encode_formatted
X-Git-Tag: v0.88~65^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa2ff3334b102eda8868a694bf837a3c92de26f8;p=ceph.git

auth: add display auid to KeyRing::encode_formatted

http://tracker.ceph.com/issues/9790 Fixes: #9790

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
---

diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc
index 96e56cd487e2..7aeb9e833a06 100644
--- a/src/auth/KeyRing.cc
+++ b/src/auth/KeyRing.cc
@@ -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();