From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 6 Jul 2008 13:04:41 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a8d1499f57d3ffaff4c0ef3259a9fbf21b2953c5;p=collectd.git

Merge branch 'collectd-4.3' into collectd-4.4
---

a8d1499f57d3ffaff4c0ef3259a9fbf21b2953c5
diff --cc src/email.c
index 510a6647,c78d7614..9a934052
--- a/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,