openldap: set the default timeout to the plugin read `Interval`

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 59247da02b8c11b2725b8244706abeaa8e779784..48de6f9021605d7500bf29a6cc1fee17f099c929 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -4660,8 +4660,9 @@ client configuration mechanisms. See ldap.conf(5) for the details.
 
 =item B<Timeout> I<Seconds>
 
-Sets the timeout value for ldap operations. Defaults to B<-1> which results in
-an infinite timeout.
+Sets the timeout value for ldap operations, in seconds. By default, the
+configured B<Interval> is used to set the timeout. Use B<-1> to disable
+(infinite timeout).
 
 =item B<Version> I<Version>
 

diff --git a/src/openldap.c b/src/openldap.c
index 1ef9f7b9aa8b43736ce4aa4e7ea60d96813d02e7..dacb719230b4e2ea4e6a2c20cd6c9fadf1b8d39a 100644 (file)
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -571,7 +571,7 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
        }
 
        st->starttls = 0;
-       st->timeout = -1;
+       st->timeout = (long) (CDTIME_T_TO_MS(plugin_get_interval()) / 1000);
        st->verifyhost = 1;
        st->version = LDAP_VERSION3;