Commit 526603ff authored by Bill Nagel's avatar Bill Nagel Committed by Steve Holme
Browse files

smb: Build with SSPI enabled 

Build SMB/CIFS protocol support when SSPI is enabled.
parent eb88d778

configure.ac

+3 −2
Original line number Original line Diff line number Diff line
@@ -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"

lib/smb.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -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 */

lib/smb.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -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 */

lib/url.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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,

lib/version.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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",