keyring: always encode in plaintext

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

diff --git a/src/ceph_authtool.cc b/src/ceph_authtool.cc
index d151e59238289f17735097e16de62d2e389fcf5b..7256c0ab670ebd9a0deabbe4da4fe0f5b359de11 100644 (file)
--- a/src/ceph_authtool.cc
+++ b/src/ceph_authtool.cc
@@ -65,7 +65,6 @@ int main(int argc, const char **argv)
   bool set_auid = false;
   uint64_t auid = CEPH_AUTH_UID_DEFAULT;
   map<string,bufferlist> caps;
-  bool bin_keyring = false;
   std::string fn;
 
   global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY,
@@ -108,8 +107,6 @@ int main(int argc, const char **argv)
        exit(1);
       }
       set_auid = true;
-    } else if (ceph_argparse_flag(args, i, "-b", "--bin", (char*)NULL)) {
-      bin_keyring = true;
     } else if (fn.empty()) {
       fn = *i++;
     } else {
@@ -264,11 +261,7 @@ int main(int argc, const char **argv)
   // write result?
   if (modified) {
     bufferlist bl;
-    if (bin_keyring) {
-      ::encode(keyring, bl);
-    } else {
-      keyring.encode_plaintext(bl);
-    }
+    keyring.encode_plaintext(bl);
     r = bl.write_file(fn.c_str(), 0600);
     if (r < 0) {
       cerr << "could not write " << fn << std::endl;

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 69bab2bb7a2ac32d308b13472ef19fd8ee62b7c1..b66194cc48a247e4dd2ffd9fbbffeea027145e34 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -444,7 +444,7 @@ bool AuthMonitor::preprocess_command(MMonCommand *m)
          if (keyring.get_auth(ename, eauth)) {
            KeyRing kr;
            kr.add(ename, eauth);
-           ::encode(kr, rdata);
+           kr.encode_plaintext(rdata);
            ss << "export " << eauth;
            r = 0;
          } else {
@@ -456,7 +456,7 @@ bool AuthMonitor::preprocess_command(MMonCommand *m)
          r = -EINVAL;
        }
       } else {
-       ::encode(keyring, rdata);
+       keyring.encode_plaintext(rdata);
        ss << "exported master keyring";
        r = 0;
       }

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 4e2deaf774908a84e6d0cd5ca587f1d36335645f..eaecc4e77b420ae7deabed782fae9c1d362fcc0e 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1858,7 +1858,7 @@ int Monitor::mkfs(bufferlist& osdmapbl)
     return r;
   }
   bufferlist keyringbl;
-  ::encode(keyring, keyringbl);
+  keyring.encode_plaintext(keyringbl);
   store->put_bl_ss(keyringbl, "mkfs", "keyring");
 
   return 0;