Merge branch 'collectd-5.2' into collectd-5.3

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/configfile.c
index ac5e8ed,be777c5..154c041
--- 1/src/configfile.c
--- 2/src/configfile.c
+++ b/src/configfile.c
@@@ -572,22 -562,9 +572,22 @@@ static int cf_include_all (oconfig_item
                        continue;
                }
  
 -              new = cf_read_generic (old->values[0].value.string, depth + 1);
 +              for (j = 0; j < old->children_num; ++j)
 +              {
 +                      oconfig_item_t *child = old->children + j;
 +
 +                      if (strcasecmp (child->key, "Filter") == 0)
 +                              cf_util_get_string (child, &pattern);
 +                      else
 +                              ERROR ("configfile: Option `%s' not allowed in <Include> block.",
 +                                              child->key);
 +              }
 +
 +              new = cf_read_generic (old->values[0].value.string, pattern, depth + 1);
 +              sfree (pattern);
 +
                if (new == NULL)
-                       continue;
+                       return (-1);
  
                /* Now replace the i'th child in `root' with `new'. */
                cf_ci_replace_child (root, new, i);
@@@ -602,10 -579,10 +602,11 @@@
        return (0);
  } /* int cf_include_all */
  
 -static oconfig_item_t *cf_read_file (const char *file, int depth)
 +static oconfig_item_t *cf_read_file (const char *file,
 +              const char *pattern, int depth)
  {
        oconfig_item_t *root;
+       int status;
  
        assert (depth < CF_MAX_DEPTH);
  

diff --cc src/types.db
Simple merge