Merge branch 'collectd-5.3' into collectd-5.4

diff --git a/src/network.c b/src/network.c
index a2221e5..5d485ba 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -2977,6 +2977,10 @@ static int network_config_set_ttl (const oconfig_item_t *ci) /* {{{ */
   tmp = (int) ci->values[0].value.number;
   if ((tmp > 0) && (tmp <= 255))
     network_config_ttl = tmp;
+  else {
+    WARNING ("network plugin: The `TimeToLive' must be between 1 and 255.");
+    return (-1);    
+  }
 
   return (0);
 } /* }}} int network_config_set_ttl */
@@ -3248,6 +3252,14 @@ static int network_config (oconfig_item_t *ci) /* {{{ */
 {
   int i;
 
+  /* The options need to be applied first */
+  for (i = 0; i < ci->children_num; i++)
+  {
+    oconfig_item_t *child = ci->children + i;
+    if (strcasecmp ("TimeToLive", child->key) == 0)
+      network_config_set_ttl (child);
+  }
+
   for (i = 0; i < ci->children_num; i++)
   {
     oconfig_item_t *child = ci->children + i;
@@ -3256,8 +3268,9 @@ static int network_config (oconfig_item_t *ci) /* {{{ */
       network_config_add_listen (child);
     else if (strcasecmp ("Server", child->key) == 0)
       network_config_add_server (child);
-    else if (strcasecmp ("TimeToLive", child->key) == 0)
-      network_config_set_ttl (child);
+    else if (strcasecmp ("TimeToLive", child->key) == 0) {
+      /* Handled earlier */
+    }
     else if (strcasecmp ("MaxPacketSize", child->key) == 0)
       network_config_set_buffer_size (child);
     else if (strcasecmp ("Forward", child->key) == 0)

diff --git a/src/openvpn.c b/src/openvpn.c
index 9ce23b4..2c93a00 100644 (file)
--- a/src/openvpn.c
+++ b/src/openvpn.c
@@ -265,7 +265,7 @@ static int multi1_read (char *name, FILE *fh)
 {
        char buffer[1024];
        char *fields[10];
-       int  fields_num, read = 0, found_header = 0;
+       int  fields_num, found_header = 0;
        long long sum_users = 0;
 
        /* read the file until the "ROUTING TABLE" line is found (no more info after) */
@@ -312,17 +312,15 @@ static int multi1_read (char *name, FILE *fh)
                                                atoll (fields[3])); /* "Bytes Sent" */
                        }
                }
-
-               read = 1;
        }
 
+       if (ferror (fh))
+               return (0);
+
        if (collect_user_count)
-       {
                numusers_submit(name, name, sum_users);
-               read = 1;
-       }
 
-       return (read);
+       return (1);
 } /* int multi1_read */
 
 /* for reading status version 2 */

diff --git a/version-gen.sh b/version-gen.sh
index c2c0f61..7bd07cb 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 DEFAULT_VERSION="5.4.2.git"