commit c9447e1c3ffba88783e5d9396b832be82d3c78fc Author: Kazuo Ito Date: Wed Dec 10 12:03:29 2008 +0900 support for LDAP_OPT_TIMEOUT OpenLDAP since 2.4 implements support for this option in ldap_result(), among other things. diff --git a/saslauthd/lak.c b/saslauthd/lak.c index 803d51f..8714265 100644 --- a/saslauthd/lak.c +++ b/saslauthd/lak.c @@ -833,6 +833,11 @@ static int lak_connect( syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %d.%d.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec); } + rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout)); + if (rc != LDAP_OPT_SUCCESS) { + syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %d.%d.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec); + } + rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit)); if (rc != LDAP_OPT_SUCCESS) { syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMELIMIT %d.", lak->conf->time_limit);