aboutsummaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2011-08-26 18:57:50 +0200
committerYang Tse <yangsita@gmail.com>2011-08-26 18:57:50 +0200
commit407e08baad45b060e3fa1387190a8b12aca9ab60 (patch)
tree6a36bd53eb6350d79441948ee88910a4a556123f /lib/url.c
parent186463e7fa863ad6aa7dfbb8ad4378badc93203c (diff)
NTLM single-sign on adjustments (X)
Functions renamed: Curl_output_ntlm_sso -> Curl_output_ntlm_wb sso_ntlm_close -> wb_ntlm_close sso_ntlm_response -> wb_ntlm_response sso_ntlm_initiate -> wb_ntlm_initiate Preprocessor symbols renamed: CURLAUTH_NTLM_SSO -> CURLAUTH_NTLM_WB CURL_VERSION_NTLM_SSO -> CURL_VERSION_NTLM_WB
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/url.c b/lib/url.c
index ded03ddd8..0cd6ac1b2 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1389,8 +1389,8 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
auth &= ~CURLAUTH_NTLM; /* no NTLM without SSL */
#endif
#ifndef USE_NTLM_SSO
- auth &= ~CURLAUTH_NTLM_SSO; /* no NTLM single-sign-on without SSL
- and ntlm_auth */
+ auth &= ~CURLAUTH_NTLM_WB; /* no NTLM single-sign-on without SSL
+ and ntlm_auth */
#endif
#ifndef USE_HTTP_NEGOTIATE
auth &= ~CURLAUTH_GSSNEGOTIATE; /* no GSS-Negotiate without GSSAPI or
@@ -1454,8 +1454,8 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
auth &= ~CURLAUTH_NTLM; /* no NTLM without SSL */
#endif
#ifndef USE_NTLM_SSO
- auth &= ~CURLAUTH_NTLM_SSO; /* no NTLM single-sign-on without SSL
- and ntlm_auth */
+ auth &= ~CURLAUTH_NTLM_WB; /* no NTLM single-sign-on without SSL
+ and ntlm_auth */
#endif
#ifndef USE_HTTP_NEGOTIATE
auth &= ~CURLAUTH_GSSNEGOTIATE; /* no GSS-Negotiate without GSSAPI or
@@ -2999,7 +2999,7 @@ ConnectionExists(struct SessionHandle *data,
if((needle->handler->protocol & CURLPROTO_FTP) ||
((needle->handler->protocol & CURLPROTO_HTTP) &&
((data->state.authhost.want==CURLAUTH_NTLM) ||
- (data->state.authhost.want==CURLAUTH_NTLM_SSO)))) {
+ (data->state.authhost.want==CURLAUTH_NTLM_WB)))) {
/* This is FTP or HTTP+NTLM, verify that we're using the same name
and password as well */
if(!strequal(needle->user, check->user) ||