Commit b4f6319c authored by Yang Tse's avatar Yang Tse
Browse files

NTLM single-sign on adjustments (XI) 

Feature string literal NTLM_SSO renamed to NTLM_WB.
Preprocessor symbol USE_NTLM_SSO renamed to WINBIND_NTLM_AUTH_ENABLED.
curl's 'long' option 'ntlm-sso' renamed to 'ntlm-wb'.
Fix some comments to make clear that this is actually a NTLM delegation.
parent e18c3f44

RELEASE-NOTES

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Curl and libcurl 7.22.0 
This release includes the following changes:



 o Added CURLOPT_GSSAPI_DELEGATION

 o Added NTLM_SSO support

 o Added support for NTLM delegation to Samba's winbind daemon helper ntlm_auth

 o Display notes from setup file in testcurl.pl

 o BSD-style lwIP TCP/IP stack support on Windows

 o OpenSSL: Use SSL_MODE_RELEASE_BUFFERS if available
@@ -19,7 +19,7 @@ This release includes the following changes: 


This release includes the following bugfixes:



 o curl_getdate: detect some illegal dates better'

 o curl_getdate: detect some illegal dates better

 o when sending a request and an error is received before the (entire) request

   body is sent, stop sending the request and close the connection after

   having received the entire response. This is equally true if an Expect:

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -2996,7 +2996,7 @@ if test "x$CURL_DISABLE_HTTP" != "x1"; then 
      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1"; then

    SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM"

    if test "x$WINBIND_NTLM_AUTH_ENABLED" = "x1"; then

      SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM_SSO"

      SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM_WB"

    fi

  fi

fi

lib/http.c

+2 −6
Original line number Diff line number Diff line
@@ -545,16 +545,12 @@ output_auth_headers(struct connectdata *conn, 
  }

  else

#endif

#ifdef USE_NTLM_SSO

  if(authstatus->picked == CURLAUTH_NTLM_WB) {

    auth="NTLM_SSO";

#ifdef WINBIND_NTLM_AUTH_ENABLED

  if(authstatus->picked == CURLAUTH_NTLM_WB) {

    auth="NTLM_WB";

    result = Curl_output_ntlm_wb(conn, proxy);

    if(result)

      return result;

#else

    return CURLE_REMOTE_ACCESS_DENIED;

#endif

  }

  else

#endif

lib/setup.h

+0 −5
Original line number Diff line number Diff line
@@ -572,11 +572,6 @@ int netware_init(void); 
#if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI) || \

   defined(USE_GNUTLS) || defined(USE_NSS)

#define USE_NTLM

#if defined(WINBIND_NTLM_AUTH_ENABLED)

/* Support NTLM single-sign-on by using Samba's winbind daemon helper

   'ntlm_auth' */

#define USE_NTLM_SSO

#endif

#endif

#endif

lib/url.c

+4 −6
Original line number Diff line number Diff line
@@ -1388,9 +1388,8 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
#ifndef USE_NTLM

    auth &= ~CURLAUTH_NTLM; /* no NTLM without SSL */

#endif

#ifndef USE_NTLM_SSO

    auth &= ~CURLAUTH_NTLM_WB; /* no NTLM single-sign-on without SSL

                                  and ntlm_auth */

#ifndef WINBIND_NTLM_AUTH_ENABLED

    auth &= ~CURLAUTH_NTLM_WB;

#endif

#ifndef USE_HTTP_NEGOTIATE

    auth &= ~CURLAUTH_GSSNEGOTIATE; /* no GSS-Negotiate without GSSAPI or
@@ -1453,9 +1452,8 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
#ifndef USE_NTLM

    auth &= ~CURLAUTH_NTLM; /* no NTLM without SSL */

#endif

#ifndef USE_NTLM_SSO

    auth &= ~CURLAUTH_NTLM_WB; /* no NTLM single-sign-on without SSL

                                  and ntlm_auth */

#ifndef WINBIND_NTLM_AUTH_ENABLED

    auth &= ~CURLAUTH_NTLM_WB;

#endif

#ifndef USE_HTTP_NEGOTIATE

    auth &= ~CURLAUTH_GSSNEGOTIATE; /* no GSS-Negotiate without GSSAPI or