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

Openldap: persistent connection + sane default timeout

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/openldap.c
index 36a29f8,dc93334..615aee3
--- 1/src/openldap.c
--- 2/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