aboutsummaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2011-08-27 01:32:49 +0200
committerYang Tse <yangsita@gmail.com>2011-08-27 01:33:35 +0200
commitb4f6319cf77ca2642154bdac76d6729dde56dd8e (patch)
tree09c0556065b81a4fb691a4febc6d8c694499096a /lib/url.c
parente18c3f447e87fa82157f1ca811c0bc30d072bcbd (diff)
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.
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/url.c b/lib/url.c
index 0cd6ac1b2..73f633f0d 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -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