From f674a62840d14f4559a5bf828cf18e767ab77512 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 16 Aug 2016 06:57:24 +0200 Subject: [PATCH] ceph plugin: Guard against g_num_daemons being zero. clang scan-build flags this, because this variable is used to declare VLAs. --- src/ceph.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ceph.c b/src/ceph.c index 5b792391..458112ae 100644 --- a/src/ceph.c +++ b/src/ceph.c @@ -1579,8 +1579,6 @@ static int ceph_read(void) /******* lifecycle *******/ static int ceph_init(void) { - int ret; - #if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_DAC_OVERRIDE) if (check_capability (CAP_DAC_OVERRIDE) != 0) { @@ -1598,9 +1596,13 @@ static int ceph_init(void) ceph_daemons_print(); - ret = cconn_main_loop(ASOK_REQ_VERSION); + if (g_num_daemons < 1) + { + ERROR ("ceph plugin: No daemons configured. See the \"Daemon\" config option."); + return ENOENT; + } - return (ret) ? ret : 0; + return cconn_main_loop(ASOK_REQ_VERSION); } static int ceph_shutdown(void) -- 2.11.0