From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 30 Mar 2018 13:42:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/collectd-5.8'
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=a9e50e9e30ecde17e167e271060c8183bfcbf407;hp=849f5394cce97a76da080f6cd9e5194b7f4ee0f0

Merge remote-tracking branch 'origin/collectd-5.8'
---

diff --git a/src/ipmi.c b/src/ipmi.c
index 2db344e6..6a72b2b7 100644
--- a/src/ipmi.c
+++ b/src/ipmi.c
@@ -785,11 +785,9 @@ entity_sensor_update_handler(enum ipmi_update_e op,
 
     if (st->sel_enabled) {
       int status = 0;
-      /* register threshold event if threshold sensor support events */
-      if ((ipmi_sensor_get_event_reading_type(sensor) ==
-           IPMI_EVENT_READING_TYPE_THRESHOLD) &&
-          (ipmi_sensor_get_threshold_access(sensor) !=
-           IPMI_THRESHOLD_ACCESS_SUPPORT_NONE))
+      /* register threshold event handler */
+      if (ipmi_sensor_get_event_reading_type(sensor) ==
+          IPMI_EVENT_READING_TYPE_THRESHOLD)
         status = ipmi_sensor_add_threshold_event_handler(
             sensor, sensor_threshold_event_handler, st);
       /* register discrete handler if discrete/specific sensor support events */
@@ -1210,7 +1208,7 @@ static int c_ipmi_init(void) {
   }
 
   /* Don't send `ADD' notifications during startup (~ 1 minute) */
-  int cycles = 1 + (60 / CDTIME_T_TO_TIME_T(plugin_get_interval()));
+  int cycles = 1 + (int)(TIME_T_TO_CDTIME_T(60) / plugin_get_interval());
 
   st = instances;
   while (NULL != st) {
diff --git a/src/uuid.c b/src/uuid.c
index 4846841b..1cb90270 100644
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -193,7 +193,7 @@ static int uuid_init(void) {
   char *uuid = uuid_get_local();
 
   if (uuid) {
-    sstrncpy(hostname_g, uuid, DATA_MAX_NAME_LEN);
+    hostname_set(uuid);
     sfree(uuid);
     return 0;
   }