common: return null if mc.init() unsuccessful

Prevents ceph.cc from segfaulting on missing keyring.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/tools/common.cc b/src/tools/common.cc
index b14cf2285c2d29ef7ee739d3c1642fa59d7e3dc2..8553b38b4058a2e7abbbd54244b3e8da6c924d35 100644 (file)
--- a/src/tools/common.cc
+++ b/src/tools/common.cc
@@ -618,13 +618,15 @@ CephToolCtx* ceph_tool_common_init(ceph_tool_mode_t mode, bool concise)
   ctx->dispatcher = new Admin(ctx.get());
   messenger->add_dispatcher_head(ctx->dispatcher);
 
+  ctx->mc.set_messenger(messenger);
+  int r = ctx->mc.init();
+  if (r < 0)
+    return NULL;
+
   ctx->lock.Lock();
   ctx->timer.init();
   ctx->lock.Unlock();
 
-  ctx->mc.set_messenger(messenger);
-  ctx->mc.init();
-
   // in case we 'tell ...'
   ctx->mc.set_want_keys(CEPH_ENTITY_TYPE_MDS | CEPH_ENTITY_TYPE_OSD);