moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-08 12:28:06 -05:00
Code Issues Releases Wiki Activity

smb: Build with SSPI enabled

Browse Source 
Build SMB/CIFS protocol support when SSPI is enabled.
This commit is contained in:
Bill Nagel 2014-12-02 13:36:40 -05:00 committed by Steve Holme
parent eb88d778e7
commit 526603ff05
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -3494,8 +3494,9 @@ if test "x$CURL_DISABLE_IMAP" != "x1"; then
fi fi
if test "x$CURL_DISABLE_SMB" != "x1" \ if test "x$CURL_DISABLE_SMB" != "x1" \
-a "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" \ -a "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" \
-a \( "x$USE_SSLEAY" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \ -a \( "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \
-o "x$NSS_ENABLED" = "x1" -o "x$DARWINSSL_ENABLED" = "x1" \); then -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \
-o "x$DARWINSSL_ENABLED" = "x1" \); then
SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMB" SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMB"
if test "x$SSL_ENABLED" = "x1"; then if test "x$SSL_ENABLED" = "x1"; then
SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMBS" SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMBS"

5
lib/smb.c
View File

@ -22,8 +22,7 @@
#include "curl_setup.h" #include "curl_setup.h"
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)
!defined(USE_WINDOWS_SSPI)
#define BUILDING_CURL_SMB_C #define BUILDING_CURL_SMB_C
@ -895,4 +894,4 @@ static CURLcode smb_parse_url_path(struct connectdata *conn)
return CURLE_OK; return CURLE_OK;
} }
#endif /* CURL_DISABLE_SMB && USE_NTLM && USE_WINDOWS_SSPI */ #endif /* CURL_DISABLE_SMB && USE_NTLM */

5
lib/smb.h
View File

@ -256,12 +256,11 @@ struct smb_tree_disconnect {
#endif /* BUILDING_CURL_SMB_C */ #endif /* BUILDING_CURL_SMB_C */
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ #if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)
!defined(USE_WINDOWS_SSPI)
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 /* CURL_DISABLE_SMB && USE_NTLM && USE_WINDOWS_SSPI */ #endif /* CURL_DISABLE_SMB && USE_NTLM */
#endif /* HEADER_CURL_SMB_H */ #endif /* HEADER_CURL_SMB_H */

3
lib/url.c
View File

@ -220,8 +220,7 @@ 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)
&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,8 +216,7 @@ 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)
"smb", "smb",
# ifdef USE_SSL # ifdef USE_SSL
"smbs", "smbs",