summaryrefslogtreecommitdiff
path: root/lib/openldap.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2012-03-08 23:31:38 +0100
committerDaniel Stenberg <daniel@haxx.se>2012-03-08 23:31:38 +0100
commit41b02378342322aa8e264260057502f4d7493239 (patch)
tree2c36f9555820464145d4153d00f24834c6df62e4 /lib/openldap.c
parentcabd010dd46ae4d37d91e20e1127cb00e67ec0a7 (diff)
downloadcurl-41b02378342322aa8e264260057502f4d7493239.tar.gz
CONNECT: made generically not per-protocol
Curl_protocol_connect() now does the tunneling through the HTTP proxy if requested instead of letting each protocol specific connection function do it.
Diffstat (limited to 'lib/openldap.c')
-rw-r--r--lib/openldap.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/lib/openldap.c b/lib/openldap.c
index a26ff2e15..3a6c7e341 100644
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -208,33 +208,6 @@ static CURLcode ldap_connect(struct connectdata *conn, bool *done)
ldap_set_option(li->ld, LDAP_OPT_PROTOCOL_VERSION, &proto);
- if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
- /* for LDAP over HTTP proxy */
- struct HTTP http_proxy;
- ldapconninfo *li_save;
- CURLcode result;
-
- /* BLOCKING */
- /* We want "seamless" LDAP operations through HTTP proxy tunnel */
-
- /* Curl_proxyCONNECT is based on a pointer to a struct HTTP at the member
- * conn->proto.http; we want LDAP through HTTP and we have to change the
- * member temporarily for connecting to the HTTP proxy. After
- * Curl_proxyCONNECT we have to set back the member to the original struct
- * LDAP pointer
- */
- li_save = data->state.proto.generic;
- memset(&http_proxy, 0, sizeof(http_proxy));
- data->state.proto.http = &http_proxy;
- result = Curl_proxyCONNECT(conn, FIRSTSOCKET,
- conn->host.name, conn->remote_port);
-
- data->state.proto.generic = li_save;
-
- if(CURLE_OK != result)
- return result;
- }
-
#ifdef USE_SSL
if(conn->handler->flags & PROTOPT_SSL) {
CURLcode res;