cURL / Mailing Lists / curl-library / Single Mail

curl-library

Re: A couple of minor patches

From: Yang Tse <yangsita_at_gmail.com>
Date: Wed, 23 Nov 2005 10:38:48 +0100

Patch in previous message had references to *.bak files. Just in case
there is any problem here goes the clean patch ...

 NTLM should only be enabled, if not specifically disabled, when HTTP
is enabled and also using SSL or SSPI.

diff -urp c:\f\curl-old/curl/lib/setup.h c:\f\curl-new/curl/lib/setup.h
--- c:\f\curl-old/curl/lib/setup.h 2005-11-23 10:10:00.000000000 +0100
+++ c:\f\curl-new/curl/lib/setup.h 2005-11-23 10:21:47.561280000 +0100
@@ -301,9 +301,11 @@ typedef int curl_socket_t;
 #define USE_SSL /* Either OpenSSL || GnuTLS */
 #endif

+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_NTLM)
 #if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI)
 #define USE_NTLM
 #endif
+#endif

 #ifdef CURLDEBUG
 #define DEBUGF(x) x
diff -urp c:\f\curl-old/curl/lib/url.c c:\f\curl-new/curl/lib/url.c
--- c:\f\curl-old/curl/lib/url.c 2005-10-28 00:05:38.000000000 +0200
+++ c:\f\curl-new/curl/lib/url.c 2005-11-23 10:22:14.760390400 +0100
@@ -1504,7 +1504,9 @@ CURLcode Curl_disconnect(struct connectd

     data->state.authproblem = FALSE;

+#ifdef USE_NTLM
     Curl_ntlm_cleanup(conn);
+#endif
   }

   if(conn->curl_disconnect)
Received on 2005-11-23