X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fapache.c;h=7ccdb60d56a91963d5ca99e08ca9346c6695ea23;hb=b42b7eaaaa3d2b375dc17b52f8858c0ebe2f5f40;hp=20a2a3cdca6b28c0adae06817f422714b2a05369;hpb=e14e8b7f5c5bf9d0fe5cc632c6383f304d4ac2ad;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 20a2a3cd..7ccdb60d 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -244,7 +244,7 @@ static int config_add (oconfig_item_t *ci)
 		ssnprintf (callback_name, sizeof (callback_name),
 				"apache/%s/%s",
 				(st->host != NULL) ? st->host : hostname_g,
-				(st->name != NULL) ? st->name : "default"),
+				(st->name != NULL) ? st->name : "default");
 
 		status = plugin_register_complex_read (/* group = */ NULL,
 				/* name      = */ callback_name,
@@ -394,8 +394,8 @@ static void submit_value (const char *type, const char *type_instance,
 	vl.values = &value;
 	vl.values_len = 1;
 
-	sstrncpy (vl.host, (st->host != NULL) ? st->host : hostname_g,
-			sizeof (vl.host));
+	if (st->host != NULL)
+		sstrncpy (vl.host, st->host, sizeof (vl.host));
 
 	sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
 	if (st->name != NULL)