Merge branch 'collectd-4.10' into collectd-5.3

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 331fad7..f9d011f 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -613,7 +613,7 @@
 #              Password "secret"
 #              Interface "eth0"
 @LOAD_PLUGIN_NETWORK@  </Server>
-#      TimeToLive "128"
+#      TimeToLive 128
 #
 #      # server setup:
 #      Listen "ff18::efc0:4a42" "25826"

diff --git a/src/types_list.c b/src/types_list.c
index 10cb4f2..887b43d 100644 (file)
--- a/src/types_list.c
+++ b/src/types_list.c
@@ -159,7 +159,7 @@ static void parse_file (FILE *fh)
       continue;
 
     while ((buf_len > 0) && ((buf[buf_len - 1] == '\n')
-         || (buf[buf_len - 1] == '\n')))
+         || (buf[buf_len - 1] == '\r')))
       buf[--buf_len] = '\0';
 
     if (buf_len == 0)