From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 20 May 2011 14:25:24 +0000 (-0700)
Subject: osd: encode keyring as plaintext after --mkkey
X-Git-Tag: v0.28.1~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4001108596f6414d78e61e9d5de50790c9ede28;p=ceph.git

osd: encode keyring as plaintext after --mkkey

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/cosd.cc b/src/cosd.cc
index 4cea4ea0cc9..581ab3b447b 100644
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -150,7 +150,7 @@ int main(int argc, const char **argv)
     eauth.key.create(CEPH_CRYPTO_AES);
     g_keyring.add(ename, eauth);
     bufferlist bl;
-    ::encode(g_keyring, bl);
+    g_keyring.encode_plaintext(bl);
     int r = bl.write_file(g_conf.keyring.c_str(), 0600);
     if (r)
       derr << TEXT_RED << " ** ERROR: writing new keyring to " << g_conf.keyring