diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/smb.c | 5 | ||||
-rw-r--r-- | lib/smb.h | 5 | ||||
-rw-r--r-- | lib/url.c | 3 | ||||
-rw-r--r-- | lib/version.c | 3 |
4 files changed, 6 insertions, 10 deletions
@@ -22,8 +22,7 @@ #include "curl_setup.h" -#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ - !defined(USE_WINDOWS_SSPI) +#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) #define BUILDING_CURL_SMB_C @@ -895,4 +894,4 @@ static CURLcode smb_parse_url_path(struct connectdata *conn) return CURLE_OK; } -#endif /* CURL_DISABLE_SMB && USE_NTLM && USE_WINDOWS_SSPI */ +#endif /* CURL_DISABLE_SMB && USE_NTLM */ @@ -256,12 +256,11 @@ struct smb_tree_disconnect { #endif /* BUILDING_CURL_SMB_C */ -#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ - !defined(USE_WINDOWS_SSPI) +#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) extern const struct Curl_handler Curl_handler_smb; extern const struct Curl_handler Curl_handler_smbs; -#endif /* CURL_DISABLE_SMB && USE_NTLM && USE_WINDOWS_SSPI */ +#endif /* CURL_DISABLE_SMB && USE_NTLM */ #endif /* HEADER_CURL_SMB_H */ @@ -220,8 +220,7 @@ static const struct Curl_handler * const protocols[] = { #endif #endif -#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ - !defined(USE_WINDOWS_SSPI) +#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) &Curl_handler_smb, #ifdef USE_SSL &Curl_handler_smbs, diff --git a/lib/version.c b/lib/version.c index 511562fe1..4b583e8e5 100644 --- a/lib/version.c +++ b/lib/version.c @@ -216,8 +216,7 @@ static const char * const protocols[] = { #ifdef USE_LIBSSH2 "sftp", #endif -#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ - !defined(USE_WINDOWS_SSPI) +#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) "smb", # ifdef USE_SSL "smbs", |