summaryrefslogtreecommitdiff
path: root/lib/ldap.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2014-04-20 19:37:54 +0200
committerDaniel Stenberg <daniel@haxx.se>2014-04-23 22:36:01 +0200
commit710f14edba4491a4ac9222a7e3103b51fd30dbe0 (patch)
tree18b564248ec40eb30d030a8e246b3ecda3715ce6 /lib/ldap.c
parentcf9342e275b784f5a6006f833b33b40043f228d4 (diff)
downloadcurl-710f14edba4491a4ac9222a7e3103b51fd30dbe0.tar.gz
handler: make 'protocol' always specified as a single bit
This makes the findprotocol() function work as intended so that libcurl can properly be restricted to not support HTTP while still supporting HTTPS - since the HTTPS handler previously set both the HTTP and HTTPS bits in the protocol field. This fixes --proto and --proto-redir for most SSL protocols. This is done by adding a few new convenience defines that groups HTTP and HTTPS, FTP and FTPS etc that should then be used when the code wants to check for both protocols at once. PROTO_FAMILY_[protocol] style. Bug: https://github.com/bagder/curl/pull/97 Reported-by: drizzt
Diffstat (limited to 'lib/ldap.c')
-rw-r--r--lib/ldap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ldap.c b/lib/ldap.c
index c2fa1735f..4c987898b 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -159,7 +159,7 @@ const struct Curl_handler Curl_handler_ldaps = {
ZERO_NULL, /* disconnect */
ZERO_NULL, /* readwrite */
PORT_LDAPS, /* defport */
- CURLPROTO_LDAP | CURLPROTO_LDAPS, /* protocol */
+ CURLPROTO_LDAPS, /* protocol */
PROTOPT_SSL /* flags */
};
#endif