From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 23 Jan 2008 19:54:10 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=2e8ad93a2f3856644a74fb508d10a9e8e4704293;p=collectd.git

Merge branch 'collectd-4.2'
---

2e8ad93a2f3856644a74fb508d10a9e8e4704293
diff --cc src/network.c
index f323e9f1,17038a45..34cf0181
--- a/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;