moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

smb: Fixed Windows autoconf builds following commit eb88d778e7

Browse Source 
As Windows based autoconf builds don't yet define USE_WIN32_CRYPTO
either explicitly through --enable-win32-cypto or automatically on
_WIN32 based platforms, subsequent builds broke with the following
error message:

"Can't compile NTLM support without a crypto library."
This commit is contained in:
Steve Holme 2014-12-07 20:44:57 +00:00
parent 090232ea19
commit dcd484a238
6 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/curl_ntlm_core.c
View File

@ -31,6 +31,8 @@
* http://www.innovation.ch/java/ntlm.html * http://www.innovation.ch/java/ntlm.html
*/ */
#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)
#ifdef USE_SSLEAY #ifdef USE_SSLEAY
# ifdef USE_OPENSSL # ifdef USE_OPENSSL
@ -734,4 +736,6 @@ CURLcode Curl_ntlm_core_mk_lmv2_resp(unsigned char *ntlmv2hash,
#endif /* USE_NTRESPONSES */ #endif /* USE_NTRESPONSES */
#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */
#endif /* USE_NTLM */ #endif /* USE_NTLM */

4
lib/curl_ntlm_core.h
View File

@ -26,6 +26,8 @@
#if defined(USE_NTLM) #if defined(USE_NTLM)
#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)
#ifdef USE_SSLEAY #ifdef USE_SSLEAY
# if !defined(OPENSSL_VERSION_NUMBER) && \ # if !defined(OPENSSL_VERSION_NUMBER) && \
!defined(HEADER_SSL_H) && !defined(HEADER_MD5_H) !defined(HEADER_SSL_H) && !defined(HEADER_MD5_H)
@ -90,6 +92,8 @@ CURLcode Curl_ntlm_core_mk_lmv2_resp(unsigned char *ntlmv2hash,
#endif /* USE_NTRESPONSES */ #endif /* USE_NTRESPONSES */
#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */
#endif /* USE_NTLM */ #endif /* USE_NTLM */
#endif /* HEADER_CURL_NTLM_CORE_H */ #endif /* HEADER_CURL_NTLM_CORE_H */

4
lib/smb.c
View File

@ -24,6 +24,8 @@
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)
#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)
#define BUILDING_CURL_SMB_C #define BUILDING_CURL_SMB_C
#ifdef _WIN32 #ifdef _WIN32
@ -894,4 +896,6 @@ static CURLcode smb_parse_url_path(struct connectdata *conn)
return CURLE_OK; return CURLE_OK;
} }
#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */
#endif /* CURL_DISABLE_SMB && USE_NTLM */ #endif /* CURL_DISABLE_SMB && USE_NTLM */

4
lib/smb.h
View File

@ -258,9 +258,13 @@ struct smb_tree_disconnect {
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)
#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)
extern const struct Curl_handler Curl_handler_smb; extern const struct Curl_handler Curl_handler_smb;
extern const struct Curl_handler Curl_handler_smbs; extern const struct Curl_handler Curl_handler_smbs;
#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */
#endif /* CURL_DISABLE_SMB && USE_NTLM */ #endif /* CURL_DISABLE_SMB && USE_NTLM */
#endif /* HEADER_CURL_SMB_H */ #endif /* HEADER_CURL_SMB_H */

3
lib/url.c
View File

@ -220,7 +220,8 @@ static const struct Curl_handler * const protocols[] = {
#endif #endif
#endif #endif
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
(!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO))
&Curl_handler_smb, &Curl_handler_smb,
#ifdef USE_SSL #ifdef USE_SSL
&Curl_handler_smbs, &Curl_handler_smbs,

3
lib/version.c
View File

@ -216,7 +216,8 @@ static const char * const protocols[] = {
#ifdef USE_LIBSSH2 #ifdef USE_LIBSSH2
"sftp", "sftp",
#endif #endif
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
(!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO))
"smb", "smb",
# ifdef USE_SSL # ifdef USE_SSL
"smbs", "smbs",