Merge branch 'collectd-3.11' into merge/collectd-4

Conflicts:

	src/multimeter.c
	src/plugin.c

diff --git a/ChangeLog b/ChangeLog
index 7756695..ef41358 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-11, Version 3.11.2
+       * plugin: Catch NULL-pointer and try to fix them. Otherwise the
+         NULL-pointer may have been passed to `printf' which causes a
+         segfault with some libcs.
+
 2007-02-10, Version 3.11.1
        * df plugin: Some wrong defines have been fixed so the plugin works
          under Solaris again.

diff --git a/collectd.spec b/collectd.spec
index d5b08af..6116ffd 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,6 @@
 Summary:       Statistics collection daemon for filling RRD files.
 Name:           collectd
-Version:       3.11.0
+Version:       3.11.2
 Release:       0
 Source:                http://collectd.org/files/%{name}-%{version}.tar.gz
 License:       GPL

diff --git a/configure.in b/configure.in
index 09e1a18..a6bc941 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.11.1)
+AC_INIT(collectd, 3.11.2)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)

diff --git a/src/email.c b/src/email.c
index 509eb23..bbee9bb 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -775,7 +775,7 @@ static void score_submit (double value)
        if ((len < 0) || (len >= BUFSIZE))
                return;
 
-       plugin_submit ("email_spam_score", NULL, buf);
+       plugin_submit ("email_spam_score", "-", buf);
        return;
 } /* static void score_submit (double) */
 

diff --git a/src/users.c b/src/users.c
index 08fc4fd..973fda0 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -74,7 +74,7 @@ static void users_submit (unsigned int users)
                return;
        }
 
-       plugin_submit(MODULE_NAME, NULL, buf);
+       plugin_submit(MODULE_NAME, "-", buf);
        return;
 } /* static void users_submit(unsigned int users) */
 #undef BUFSIZE