From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 10 May 2016 08:24:29 +0000 (+0200)
Subject: Merge pull request #1308 from mfournier/openldap-persistent-connection
X-Git-Tag: collectd-5.6.0~300
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=354f9991530248e45207d236eb74c1cc3d5238ef;p=collectd.git

Merge pull request #1308 from mfournier/openldap-persistent-connection

Openldap: persistent connection + sane default timeout
---

354f9991530248e45207d236eb74c1cc3d5238ef
diff --cc src/openldap.c
index 36a29f8d,dc933344..615aee33
--- a/src/openldap.c
+++ b/src/openldap.c
@@@ -701,8 -733,5 +737,9 @@@ void module_register (void) /* {{{ *
  {
  	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