]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon/Monitor.cc: attempt to decode and extract keyring only if it is found.
authorPiotr Dałek <piotr.dalek@ts.fujitsu.com>
Thu, 12 Nov 2015 09:09:46 +0000 (10:09 +0100)
committerPiotr Dałek <piotr.dalek@ts.fujitsu.com>
Mon, 7 Dec 2015 13:26:37 +0000 (14:26 +0100)
commitbb4936aa61d809f8a72cb8d83846c9c48ebcf92e
tree39f4a572e7be42129f172ff611d54615d43aa79f
parent08ae31c02ecb1bc9357407aad9dfbb1c557b74b7
mon/Monitor.cc: attempt to decode and extract keyring only if it is found.

Monitor::preinit wrongly assumes that keyring always exists. This worked
so far because the logic that followed made this error invisible.
Change the logic so no attempt is taken to decode empty bufferlist, and
in turn - to extract_save_mon_key from empty keyring.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
src/mon/Monitor.cc