X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=6489bce261180ca763497f2c148f972185012571;hb=17a04c7afcf44707f6bc45697212c1f8fc6aa761;hp=7667f247604b330ace7f4426aef9d659a139c05c;hpb=430b0b4d0275f7fea64376fc166e81fc0bcc36bf;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 7667f247..6489bce2 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -55,7 +55,7 @@ static const char *config_keys[] =
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
 static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb,
-		void *stream)
+		void __attribute__((unused)) *stream)
 {
 	size_t len = size * nmemb;
 
@@ -148,7 +148,7 @@ static int init (void)
 
 		status = ssnprintf (credentials, sizeof (credentials), "%s:%s",
 				user, (pass == NULL) ? "" : pass);
-		if (status >= sizeof (credentials))
+		if ((status < 0) || ((size_t) status >= sizeof (credentials)))
 		{
 			ERROR ("apache plugin: init: Returning an error "
 					"because the credentials have been "
@@ -160,6 +160,7 @@ static int init (void)
 	}
 
 	curl_easy_setopt (curl, CURLOPT_URL, url);
+	curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
 
 	if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
 	{
@@ -197,10 +198,9 @@ static void submit_counter (const char *type, const char *type_instance,
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "apache");
-	strcpy (vl.plugin_instance, "");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 
 	if (type_instance != NULL)
@@ -220,10 +220,9 @@ static void submit_gauge (const char *type, const char *type_instance,
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "apache");
-	strcpy (vl.plugin_instance, "");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 
 	if (type_instance != NULL)