X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Femail.c;h=c78d76146835ab2e55bedac09c8a36f71752e132;hb=bcb24183992bccb89769b92077fcdeade83689e1;hp=594ef962d97c6441a6c53f17381142b15f65ea4b;hpb=2b6176cab4f092354177473bbc74c5cdc2eaa2ec;p=collectd.git

diff --git a/src/email.c b/src/email.c
index 594ef962..c78d7614 100644
--- a/src/email.c
+++ b/src/email.c
@@ -39,6 +39,8 @@
 
 #include "configfile.h"
 
+#include <stddef.h>
+
 #if HAVE_LIBPTHREAD
 # include <pthread.h>
 #endif
@@ -61,11 +63,7 @@
 /* 256 bytes ought to be enough for anybody ;-) */
 #define BUFSIZE 256
 
-#ifndef COLLECTD_SOCKET_PREFIX
-# define COLLECTD_SOCKET_PREFIX "/tmp/.collectd-"
-#endif /* COLLECTD_SOCKET_PREFIX */
-
-#define SOCK_PATH COLLECTD_SOCKET_PREFIX"email"
+#define SOCK_PATH LOCALSTATEDIR"/run/"PACKAGE_NAME"-email"
 #define MAX_CONNS 5
 #define MAX_CONNS_LIMIT 16384
 
@@ -119,6 +117,7 @@ typedef struct {
 /* valid configuration file keys */
 static const char *config_keys[] =
 {
+	"SocketFile",
 	"SocketGroup",
 	"SocketPerms",
 	"MaxConns"
@@ -126,6 +125,7 @@ static const char *config_keys[] =
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
 /* socket configuration */
+static char *sock_file  = SOCK_PATH;
 static char *sock_group = COLLECTD_GRP_NAME;
 static int  sock_perms  = S_IRWXU | S_IRWXG;
 static int  max_conns   = MAX_CONNS;
@@ -171,7 +171,10 @@ static type_list_t check;
  */
 static int email_config (const char *key, const char *value)
 {
-	if (0 == strcasecmp (key, "SocketGroup")) {
+	if (0 == strcasecmp (key, "SocketFile")) {
+		sock_file = sstrdup (value);
+	}
+	else if (0 == strcasecmp (key, "SocketGroup")) {
 		sock_group = sstrdup (value);
 	}
 	else if (0 == strcasecmp (key, "SocketPerms")) {
@@ -508,9 +511,8 @@ static void *open_connection (void *arg)
 
 	addr.sun_family = AF_UNIX;
 
-	strncpy (addr.sun_path, SOCK_PATH, (size_t)(UNIX_PATH_MAX - 1));
+	strncpy (addr.sun_path, sock_file, (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,
@@ -555,12 +557,12 @@ static void *open_connection (void *arg)
 		}
 		else
 		{
-			status = chown (SOCK_PATH, (uid_t) -1, grp->gr_gid);
+			status = chown (sock_file, (uid_t) -1, grp->gr_gid);
 			if (status != 0)
 			{
 				char errbuf[1024];
 				log_warn ("chown (%s, -1, %i) failed: %s",
-						SOCK_PATH, (int) grp->gr_gid,
+						sock_file, (int) grp->gr_gid,
 						sstrerror (errno, errbuf, sizeof (errbuf)));
 			}
 		}
@@ -571,7 +573,7 @@ static void *open_connection (void *arg)
 	}
 
 	errno = 0;
-	if (0 != chmod (SOCK_PATH, sock_perms)) {
+	if (0 != chmod (sock_file, sock_perms)) {
 		char errbuf[1024];
 		log_warn ("chmod() failed: %s",
 				sstrerror (errno, errbuf, sizeof (errbuf)));
@@ -714,7 +716,7 @@ static int email_shutdown (void)
 
 	pthread_mutex_unlock (&conns_mutex);
 
-	unlink (SOCK_PATH);
+	unlink (sock_file);
 	errno = 0;
 
 	return (0);
@@ -730,8 +732,8 @@ static void email_submit (const char *type, const char *type_instance, gauge_t v
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "email");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "email", sizeof (vl.plugin));
 	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
 	plugin_dispatch_values (type, &vl);