aboutsummaryrefslogtreecommitdiff
path: root/lib/ftp.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-05-05 15:49:43 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-05-05 15:49:43 +0200
commite34131db783336aa17fa0aa664635867459b2a85 (patch)
treeda9d24dbb53329dade737173e340618a509a8759 /lib/ftp.c
parent335dfa793c239283b0003d3f10739051c10ecb13 (diff)
SSL: check for SSL, not specific protocols
Code cleanup to check less for protocols and more for the specific relevant feature. Like if SSL is required.
Diffstat (limited to 'lib/ftp.c')
-rw-r--r--lib/ftp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 203afe6ba..ec8d9f11d 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -2946,10 +2946,8 @@ static CURLcode ftp_connect(struct connectdata *conn,
return result;
}
- if(conn->handler->protocol & CURLPROTO_FTPS) {
+ if(conn->handler->flags & PROTOPT_SSL) {
/* BLOCKING */
- /* FTPS is simply ftp with SSL for the control channel */
- /* now, perform the SSL initialization for this socket */
result = Curl_ssl_connect(conn, FIRSTSOCKET);
if(result)
return result;