X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Femail.c;h=e208f13049f168cbc08775366d5e01f7523c1982;hb=5b5f7f4e3dd28d9e41469c331f3f9f6a09e3147b;hp=0882ad46299b5d118494c0407c7f4a9a0f17a9cb;hpb=4e51eefd95e80f90eae602958713c9c630659ce7;p=collectd.git

diff --git a/src/email.c b/src/email.c
index 0882ad46..e208f130 100644
--- a/src/email.c
+++ b/src/email.c
@@ -390,9 +390,7 @@ static void *open_connection (void *arg)
 	}
 
 	addr.sun_family = AF_UNIX;
-
-	strncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
-	addr.sun_path[UNIX_PATH_MAX - 1] = '\0';
+	sstrncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
 
 	errno = 0;
 	if (-1 == bind (connector_socket, (struct sockaddr *)&addr,
@@ -655,9 +653,10 @@ static void email_submit (const char *type, const char *type_instance, gauge_t v
 	vl.time = time (NULL);
 	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));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void email_submit */
 
 /* Copy list l1 to list l2. l2 may partly exist already, but it is assumed