From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 3 Mar 2015 23:39:09 +0000 (+0100)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.5.0~62^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27aeac9988dde1d53e5df697ce0e1b8a951d091a;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	configure.ac
---

27aeac9988dde1d53e5df697ce0e1b8a951d091a
diff --cc configure.ac
index be5dc72b8,877ac4491..f370a8638
--- a/configure.ac
+++ 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 b60c04ba1,489d0f70c..cb1005e8d
--- a/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)
  	{