Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
	README

diff --git a/README b/README
index 5071617209c7a76d7779cc4a9cfed1972605b464..c5c2b7fa6b470c0d1b8bc1e89873a31831a68e89 100644 (file)
--- a/README
+++ b/README
@@ -33,9 +33,6 @@ Features
       Batterycharge, -current and voltage of ACPI and PMU based laptop
       batteries.
 
-    - curl
-      Parse statistics from websites using regular expressions.
-
     - bind
       Name server and resolver statistics from the `statistics-channel'
       interface of BIND 9.5, 9,6 and later.
@@ -50,6 +47,9 @@ Features
     - cpufreq
       CPU frequency (For laptops with speed step or a similar technology)
 
+    - curl
+      Parse statistics from websites using regular expressions.
+
     - curl_json
       Retrieves JSON data via cURL and parses it according to user
       configuration.

diff --git a/src/df.c b/src/df.c
index 194c25730107f43149d6ea9f273ef24f74a19d45..462e1c6778fe3aa2f1066de9e3172b548fada012 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -136,7 +136,7 @@ static void df_submit (char *df_name,
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "df", sizeof (vl.plugin));
        sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
-       sstrncpy (vl.type, "df", sizeof (vl.host));
+       sstrncpy (vl.type, "df", sizeof (vl.type));
        sstrncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
 
        plugin_dispatch_values (&vl);