sbonazzo / rpms / cyrus-sasl

Forked from rpms/cyrus-sasl 2 years ago
Clone

Blame SOURCES/cyrus-sasl-2.1.22-ldap-timeout.patch

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