Merge branch 'collectd-5.6' into collectd-5.7

diff --combined src/network.c
index 8eab08b,2ff09af..f93f49c
--- 1/src/network.c
--- 2/src/network.c
+++ b/src/network.c
@@@ -292,7 -292,7 +292,7 @@@ static char *send_buffer
  static char *send_buffer_ptr;
  static int send_buffer_fill;
  static cdtime_t send_buffer_last_update;
 -static value_list_t send_buffer_vl = VALUE_LIST_STATIC;
 +static value_list_t send_buffer_vl = VALUE_LIST_INIT;
  static pthread_mutex_t send_buffer_lock = PTHREAD_MUTEX_INITIALIZER;
  
  /* XXX: These counters are incremented from one place only. The spot in which
@@@ -1003,14 -1003,6 +1003,6 @@@ static int parse_part_sign_sha256(socke
    buffer_len = *ret_buffer_len;
    buffer_offset = 0;
  
-   if (se->data.server.userdb == NULL) {
-     c_complain(
-         LOG_NOTICE, &complain_no_users,
-         "network plugin: Received signed network packet but can't verify it "
-         "because no user DB has been configured. Will accept it.");
-     return (0);
-   }
- 
    /* Check if the buffer has enough data for this structure. */
    if (buffer_len <= PART_SIGNATURE_SHA256_SIZE)
      return (-ENOMEM);
@@@ -1027,6 -1019,18 +1019,18 @@@
      return (-1);
    }
  
+   if (se->data.server.userdb == NULL) {
+     c_complain(
+         LOG_NOTICE, &complain_no_users,
+         "network plugin: Received signed network packet but can't verify it "
+         "because no user DB has been configured. Will accept it.");
+ 
+     *ret_buffer = buffer + pss_head_length;
+     *ret_buffer_len -= pss_head_length;
+ 
+     return (0);
+   }
+ 
    /* Copy the hash. */
    BUFFER_READ(pss.hash, sizeof(pss.hash));
  
@@@ -3082,6 -3086,7 +3086,6 @@@ static int network_stats_read(void) /* 
    vl.values = values;
    vl.values_len = 2;
    vl.time = 0;
 -  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
    sstrncpy(vl.plugin, "network", sizeof(vl.plugin));
  
    /* Octets received / sent */
@@@ -3162,8 -3167,7 +3166,8 @@@ static int network_init(void) 
    if (dispatch_thread_running == 0) {
      int status;
      status = plugin_thread_create(&dispatch_thread_id, NULL /* no attributes */,
 -                                  dispatch_thread, NULL /* no argument */);
 +                                  dispatch_thread, NULL /* no argument */,
 +                                  "network disp");
      if (status != 0) {
        char errbuf[1024];
        ERROR("network: pthread_create failed: %s",
@@@ -3176,8 -3180,7 +3180,8 @@@
    if (receive_thread_running == 0) {
      int status;
      status = plugin_thread_create(&receive_thread_id, NULL /* no attributes */,
 -                                  receive_thread, NULL /* no argument */);
 +                                  receive_thread, NULL /* no argument */,
 +                                  "network recv");
      if (status != 0) {
        char errbuf[1024];
        ERROR("network: pthread_create failed: %s",