aboutsummaryrefslogtreecommitdiff
path: root/lib/http.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/http.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/http.c')
-rw-r--r--lib/http.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/http.c b/lib/http.c
index fa8c7c39f..54bb53527 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -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