projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
89be8cc
22b9f54
)
Merge branch 'collectd-5.5' into collectd-5.6
author
Florian Forster
<octo@collectd.org>
Fri, 2 Sep 2016 07:32:30 +0000
(09:32 +0200)
committer
Florian Forster
<octo@collectd.org>
Fri, 2 Sep 2016 07:32:30 +0000
(09:32 +0200)
1
2
src/network.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/network.c
index
51c0757
,
f114060
..
9a0f429
---
1
/
src/network.c
---
2
/
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);