From: Florian Forster <octo@collectd.org>
Date: Fri, 2 Sep 2016 07:32:30 +0000 (+0200)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.7.0~111^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fd06911c23375dc40beeef0406ddf98cec7d3fcf;p=collectd.git

Merge branch 'collectd-5.5' into collectd-5.6
---

fd06911c23375dc40beeef0406ddf98cec7d3fcf
diff --cc src/network.c
index 51c07573,f1140608..9a0f429a
--- a/src/network.c
+++ b/src/network.c
@@@ -3449,15 -3558,7 +3444,7 @@@ static int network_init (void
  		return (0);
  	have_init = 1;
  
- #if HAVE_LIBGCRYPT
- 	if (network_init_gcrypt () < 0)
- 	{
- 		ERROR ("network plugin: Failed to initialize crypto library.");
- 		return (-1);
- 	}
- #endif
- 
 -	if (network_config_stats != 0)
 +	if (network_config_stats)
  		plugin_register_read ("network", network_stats_read);
  
  	plugin_register_shutdown ("network", network_shutdown);