Merge branch 'collectd-4.3' into collectd-4.4

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

diff --cc src/email.c
index 510a66470cb2142872a402f3d40e60e8286f133b,c78d76146835ab2e55bedac09c8a36f71752e132..9a934052e03aed9533139d9f2130ca9b32848c98
--- 1/src/email.c
--- 2/src/email.c
+++ b/src/email.c
@@@ -394,9 -511,8 +394,8 @@@ static void *open_connection (void *arg
  
        addr.sun_family = AF_UNIX;
  
 -      strncpy (addr.sun_path, sock_file, (size_t)(UNIX_PATH_MAX - 1));
 +      strncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
        addr.sun_path[UNIX_PATH_MAX - 1] = '\0';
-       unlink (addr.sun_path);
  
        errno = 0;
        if (-1 == bind (connector_socket, (struct sockaddr *)&addr,

diff --cc src/plugin.c
Simple merge

diff --cc src/rrdtool.c
Simple merge