Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	configure.ac

diff --cc configure.ac
index be5dc72b8d3d6ebad345be55eac3600f4d5c8f3e,877ac449146f0645d72b64f5b86ce796535971a0..f370a86386d19eae5284f1654724a93ac8df861e
--- 1/configure.ac
--- 2/configure.in
+++ b/configure.ac
@@@ -5435,11 -5244,9 +5435,11 @@@ cat <<EOF
  
  Configuration:
    Libraries:
 +    intel mic . . . . . . $with_mic
 +    libaquaero5 . . . . . $with_libaquaero5
+     libcredis . . . . . . $with_libcredis
      libcurl . . . . . . . $with_libcurl
      libdbi  . . . . . . . $with_libdbi
-     libcredis . . . . . . $with_libcredis
      libesmtp  . . . . . . $with_libesmtp
      libganglia  . . . . . $with_libganglia
      libgcrypt . . . . . . $with_libgcrypt
@@@ -5449,10 -5257,11 +5450,11 @@@
      libkstat  . . . . . . $with_kstat
      libkvm  . . . . . . . $with_libkvm
      libmemcached  . . . . $with_libmemcached
 +    libmnl  . . . . . . . $with_libmnl
      libmodbus . . . . . . $with_libmodbus
+     libmongoc . . . . . . $with_libmongoc
      libmysql  . . . . . . $with_libmysql
      libnetapp . . . . . . $with_libnetapp
 -    libnetlink  . . . . . $with_libnetlink
      libnetsnmp  . . . . . $with_libnetsnmp
      libnotify . . . . . . $with_libnotify
      liboconfig  . . . . . $with_liboconfig

diff --cc src/plugin.c
index b60c04ba127f32c4603dd4f08ecfc64ef155d67e,489d0f70c948dd9129dc5156867741412c047b2f..cb1005e8dffaa0537737183d338fc7278040fd3e
--- 1/src/plugin.c
--- 2/src/plugin.c
+++ b/src/plugin.c
@@@ -912,30 -845,14 +911,29 @@@ int plugin_load (char const *plugin_nam
        dir = plugin_get_dir ();
        ret = 1;
  
 +      /*
 +       * XXX: Magic at work:
 +       *
 +       * Some of the language bindings, for example the Python and Perl
 +       * plugins, need to be able to export symbols to the scripts they run.
 +       * For this to happen, the "Globals" flag needs to be set.
 +       * Unfortunately, this technical detail is hard to explain to the
 +       * average user and she shouldn't have to worry about this, ideally.
 +       * So in order to save everyone's sanity use a different default for a
 +       * handful of special plugins. --octo
 +       */
 +      if ((strcasecmp ("perl", plugin_name) == 0)
 +                      || (strcasecmp ("python", plugin_name) == 0))
 +              flags |= PLUGIN_FLAGS_GLOBAL;
 +
        /* `cpu' should not match `cpufreq'. To solve this we add `.so' to the
         * type when matching the filename */
 -      status = ssnprintf (typename, sizeof (typename), "%s.so", type);
 +      status = ssnprintf (typename, sizeof (typename), "%s.so", plugin_name);
        if ((status < 0) || ((size_t) status >= sizeof (typename)))
        {
 -              WARNING ("plugin_load: Filename too long: \"%s.so\"", type);
 +              WARNING ("plugin_load: Filename too long: \"%s.so\"", plugin_name);
                return (-1);
        }
-       typename_len = strlen (typename);
  
        if ((dh = opendir (dir)) == NULL)
        {