Merge branch 'collectd-5.5' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 07:32:30 +0000 (09:32 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 07:32:30 +0000 (09:32 +0200)
1  2 
src/network.c

diff --cc 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);