X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fceph.c;h=b186a276335d1b7e8867a1b170ff864845f4a83e;hb=e35c68e1999cab48e8b912f7e90b535d1afe9353;hp=e9bb960d9492958992dfabe336b3cfcd1e5d6bea;hpb=e5e5d99350fa54e22f07b90fbc3102df51565ad9;p=collectd.git

diff --git a/src/ceph.c b/src/ceph.c
index e9bb960d..b186a276 100644
--- a/src/ceph.c
+++ b/src/ceph.c
@@ -1528,6 +1528,7 @@ static int cconn_main_loop(uint32_t request_type)
             if(revents == 0)
             {
                 /* do nothing */
+                continue;
             }
             else if(cconn_validate_revents(io, revents))
             {
@@ -1577,14 +1578,14 @@ static int ceph_init(void)
 {
     int ret;
 
-#ifdef HAVE_SYS_CAPABILITY_H
+#if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_DAC_OVERRIDE)
   if (check_capability (CAP_DAC_OVERRIDE) != 0)
   {
     if (getuid () == 0)
       WARNING ("ceph plugin: Running collectd as root, but the "
           "CAP_DAC_OVERRIDE capability is missing. The plugin's read "
           "function will probably fail. Is your init system dropping "
-          "capabilities ?");
+          "capabilities?");
     else
       WARNING ("ceph plugin: collectd doesn't have the CAP_DAC_OVERRIDE "
           "capability. If you don't want to run collectd as root, try running "