From: Eric Covener <covener@apache.org>
Date: Mon, 24 Jun 2013 19:42:15 +0000 (+0000)
Subject: uldap_simple_bind was subsequently rewritten to use the op_timeout with ldap_result()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea2546d3a82f5acf57dff8a9a7a945d61db405ca;p=thirdparty%2Fapache%2Fhttpd.git

uldap_simple_bind was subsequently rewritten to use the op_timeout with ldap_result()
which is portable, which means LDAPTimeout is used for bind & search regardless of
this LDAP options availability.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496177 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 542f7090ade..fcc56cd13b9 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -2669,14 +2669,6 @@ static const char *util_ldap_set_op_timeout(cmd_parms *cmd,
                  "ldap connection: Setting op timeout to %ld seconds.",
                  timeout);
 
-#ifndef LDAP_OPT_TIMEOUT
-
-    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server, APLOGNO(01314)
-                 "LDAP: LDAP_OPT_TIMEOUT option not supported by the "
-                 "LDAP library in use. Using LDAPTimeout value as search "
-                 "timeout only." );
-#endif
-
     return NULL;
 }