From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 16 May 2018 13:19:05 +0000 (+0200)
Subject: Merge branch 'collectd-5.8'
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=06a86a60a7dabc685bdbd81ce3d36ea5f7e2c2d4

Merge branch 'collectd-5.8'

Conflicts:
	src/ipmi.c
---

06a86a60a7dabc685bdbd81ce3d36ea5f7e2c2d4
diff --cc src/ipmi.c
index 7f628bfd,98cc3b05..67fd949c
--- a/src/ipmi.c
+++ b/src/ipmi.c
@@@ -1062,10 -1062,15 +1062,15 @@@ static int c_ipmi_config_add_instance(o
    for (int i = 0; i < ci->children_num; i++) {
      oconfig_item_t *child = ci->children + i;
  
-     if (strcasecmp("Sensor", child->key) == 0)
-       ignorelist_add(st->ignorelist, child->values[0].value.string);
-     else if (strcasecmp("IgnoreSelected", child->key) == 0) {
+     if (strcasecmp("Sensor", child->key) == 0) {
+       char *value = NULL;
+       status = cf_util_get_string(child, &value);
+       if (status != 0)
+         break;
+       ignorelist_add(st->ignorelist, value);
+       sfree(value);
+     } else if (strcasecmp("IgnoreSelected", child->key) == 0) {
 -      _Bool t;
 +      bool t;
        status = cf_util_get_boolean(child, &t);
        if (status != 0)
          break;