From: Dan Mick <dan.mick@inktank.com>
Date: Wed, 10 Jul 2013 23:44:56 +0000 (-0700)
Subject: mon: AuthMonitor: dump formatted and plaintext key on 'get-key'
X-Git-Tag: v0.67-rc1~104
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7da0320c56510f941e86c0cdef13dc5126acadad;p=ceph.git

mon: AuthMonitor: dump formatted and plaintext key on 'get-key'

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 9e2aed4b74a..9d6f26aa9df 100644
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -617,7 +617,11 @@ bool AuthMonitor::preprocess_command(MMonCommand *m)
       r = -ENOENT;
       goto done;
     }
-    ds << auth.key;
+    if (f) {
+      auth.key.encode_formatted("auth", f.get(), rdata);
+    } else {
+      auth.key.encode_plaintext(rdata);
+    }
     r = 0;
   } else if (prefix == "auth list") {
     mon->key_server.list_secrets(ss, ds);