From: Florian Forster <octo@collectd.org>
Date: Tue, 6 Sep 2016 06:08:01 +0000 (+0200)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b847e8ff2fd928813397466a941947c8fce66d66;p=thirdparty%2Fcollectd.git

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

b847e8ff2fd928813397466a941947c8fce66d66
diff --cc src/network.c
index 51c075735,f11406088..9a0f429aa
--- 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);