smb: Build with SSPI enabled

Build SMB/CIFS protocol support when SSPI is enabled.

diff --git a/configure.ac b/configure.ac
index fb8dfd5b35ad37d3723a0b25295ac843990a6cba..2cfef5ac2eb1f47c841af71edaae64c217b62048 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3494,8 +3494,9 @@ if test "x$CURL_DISABLE_IMAP" != "x1"; then
 fi
 if test "x$CURL_DISABLE_SMB" != "x1" \
     -a "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" \
-    -a \( "x$USE_SSLEAY" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \
-      -o "x$NSS_ENABLED" = "x1" -o "x$DARWINSSL_ENABLED" = "x1" \); then
+    -a \( "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \
+      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \
+      -o "x$DARWINSSL_ENABLED" = "x1" \); then
   SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMB"
   if test "x$SSL_ENABLED" = "x1"; then
     SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMBS"

diff --git a/lib/smb.c b/lib/smb.c
index 1644471dfd90bfd55a5b345ea4a286b76edbfbd2..7627c8943bdd0634834ebddff46583a8418daa66 100644 (file)
--- a/lib/smb.c
+++ b/lib/smb.c
@@ -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 */

diff --git a/lib/smb.h b/lib/smb.h
index 7b601b889a5fc64b5072da66c36649e936639ffb..ff1a812e38037b4ed30268af6d828068d653388e 100644 (file)
--- a/lib/smb.h
+++ b/lib/smb.h
@@ -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 */

diff --git a/lib/url.c b/lib/url.c
index e6483ca88d69dbfff66defc8b7e75f66ad2fd5ff..8b4f3a95cc3660ce86073d0bfed94b4e60251be6 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -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 511562fe1951b9c2f76adc1b0703b9c535860824..4b583e8e53c14976de4fdf8cd4cd6dcf19fc49ae 100644 (file)
--- 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",