Merge branch 'collectd-4.2'

diff --cc src/network.c
index f323e9f1208f9fb58c2c7491aa6d1deedf1ea90f,17038a45a0a9e09416b0ce5d28f43bafd005469e..34cf0181eb7428b1816b7400375f7448e6b7067c
--- 1/src/network.c
--- 2/src/network.c
+++ b/src/network.c
@@@ -1485,12 -1413,9 +1566,12 @@@ static int network_init (void
  
        /* setup socket(s) and so on */
        if (sending_sockets != NULL)
 +      {
                plugin_register_write ("network", network_write);
 +              plugin_register_notification ("network", network_notification);
 +      }
  
-       if ((listen_sockets_num != 0) && (listen_thread == 0))
+       if ((listen_sockets_num != 0) && (receive_thread_id == 0))
        {
                int status;