Fixed a few compile errors and warnings.

1 files changed, 13 insertions, 6 deletions

diff --git a/lib/ftp.c b/lib/ftp.c
index 19b1f4efc..ba05a507d 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -220,7 +220,7 @@ const struct Curl_handler Curl_handler_ftp_proxy = {
 };
 
 
-# ifdef USE_SSL
+#ifdef USE_SSL
 /*
  * HTTP-proxyed FTPS protocol handler.
  */
@@ -240,7 +240,7 @@ const struct Curl_handler Curl_handler_ftps_proxy = {
   PORT_FTPS,                            /* defport */
   PROT_HTTP                             /* protocol */
 };
-# endif
+#endif
 #endif
 
 
@@ -4109,10 +4109,17 @@ static CURLcode Curl_ftp_setup_connection(struct connectdata * conn)
     /* Unless we have asked to tunnel ftp operations through the proxy, we
        switch and use HTTP operations only */
 #ifndef CURL_DISABLE_HTTP
-  if (conn->handler == &Curl_handler_ftp)
-    conn->handler = &Curl_handler_ftp_proxy;
-  else
-    conn->handler = &Curl_handler_ftps_proxy;
+    if (conn->handler == &Curl_handler_ftp)
+      conn->handler = &Curl_handler_ftp_proxy;
+    else {
+#ifdef USE_SSL
+      conn->handler = &Curl_handler_ftps_proxy;
+#else
+      failf(data, "FTPS not supported!");
+      return CURLE_UNSUPPORTED_PROTOCOL;
+#endif
+    }
+
 #else
     failf(data, "FTP over http proxy requires HTTP support built-in!");
     return CURLE_UNSUPPORTED_PROTOCOL;