SOCKS: truly disable it if CURL_DISABLE_PROXY is defined

Bug: http://curl.haxx.se/bug/view.cgi?id=3561305

Patch by: Marcel Raad

diff --git a/lib/socks.c b/lib/socks.c
index b382de798668c31f504986b75392372e0a106b9a..43e6d95f6b9978e6b6b11ae1c691f989e8757447 100644 (file)
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -22,7 +22,7 @@
 
 #include "setup.h"
 
-#if !defined(CURL_DISABLE_PROXY) || defined(USE_WINDOWS_SSPI)
+#if !defined(CURL_DISABLE_PROXY)
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index edebf7a479dfa9864628ccff1ad2f89b1a04ba7c..6e95e3c35a5a957f444fff5a22079edf3b7c74aa 100644 (file)
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -23,7 +23,7 @@
 
 #include "setup.h"
 
-#ifdef USE_WINDOWS_SSPI
+#if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_PROXY)
 
 #include "urldata.h"
 #include "sendf.h"