author | Marc Fournier <marc.fournier@camptocamp.com> | |
Tue, 10 May 2016 08:24:29 +0000 (10:24 +0200) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Tue, 10 May 2016 08:24:29 +0000 (10:24 +0200) |
Openldap: persistent connection + sane default timeout
1 | 2 | |||
---|---|---|---|---|
src/collectd.conf.pod | patch | | diff1 | | diff2 | | blob | history |
src/openldap.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/openldap.c
index 36a29f8dadb229a3955308035e71d3d012ca5c20,dc93334458c5fc46e95fc1b7406cfd1bbc27ec21..615aee338b28b70cba4cab0260c09d3ba7c1a847
--- 1/src/openldap.c
--- 2/src/openldap.c
+++ b/src/openldap.c
{
plugin_register_complex_config ("openldap", cldap_config);
plugin_register_init ("openldap", cldap_init);
+ plugin_register_shutdown ("openldap", cldap_shutdown);
} /* }}} void module_register */
+
+#if defined(__APPLE__)
+#pragma clang diagnostic pop
+#endif