]> granicus.if.org Git - apache/commitdiff
uldap_simple_bind was subsequently rewritten to use the op_timeout with ldap_result()
authorEric Covener <covener@apache.org>
Mon, 24 Jun 2013 19:42:15 +0000 (19:42 +0000)
committerEric Covener <covener@apache.org>
Mon, 24 Jun 2013 19:42:15 +0000 (19:42 +0000)
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

modules/ldap/util_ldap.c

index 542f7090aded8d150def6657b0aefa6747b08976..fcc56cd13b905c740d3bc5460314121d42efb7c3 100644 (file)
@@ -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;
 }