Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
	src/utils_match.c

diff --cc src/smart.c
Simple merge

diff --cc src/utils_match.c
index 2e487b5933fc0b32525ea000fabca09e45b65772,be5dfd6ee6a774497edcbed11e84939ee7c57b70..11b3f74f9394c0cb2727e1d47f1d31c49b10fe33
--- 1/src/utils_match.c
--- 2/src/daemon/utils_match.c
+++ b/src/utils_match.c
@@@ -33,7 -33,9 +33,8 @@@
  
  #include <regex.h>
  
 -#define UTILS_MATCH_FLAGS_FREE_USER_DATA 0x01
  #define UTILS_MATCH_FLAGS_EXCLUDE_REGEX 0x02
+ #define UTILS_MATCH_FLAGS_REGEX 0x04
  
  struct cu_match_s {
    regex_t regex;
@@@ -301,8 -273,12 +303,12 @@@ void match_destroy(cu_match_t *obj) 
    if (obj == NULL)
      return;
  
 -  if (obj->flags & UTILS_MATCH_FLAGS_FREE_USER_DATA)
 -    sfree(obj->user_data);
+   if (obj->flags & UTILS_MATCH_FLAGS_REGEX)
+     regfree(&obj->regex);
+   if (obj->flags & UTILS_MATCH_FLAGS_EXCLUDE_REGEX)
+     regfree(&obj->excluderegex);
 +  if ((obj->user_data != NULL) && (obj->free != NULL))
 +    (*obj->free)(obj->user_data);
  
    sfree(obj);
  } /* void match_destroy */