From b4f6319cf77ca2642154bdac76d6729dde56dd8e Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 27 Aug 2011 01:32:49 +0200
Subject: 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.
---
tests/data/test1310 | 4 ++--
tests/runtests.pl | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'tests')
diff --git a/tests/data/test1310 b/tests/data/test1310
index 9187acfe3..fd389d3ef 100644
--- a/tests/data/test1310
+++ b/tests/data/test1310
@@ -55,7 +55,7 @@ Finally, this is the real page!
# Client-side
<client>
<features>
-NTLM_SSO
+NTLM_WB
debug
</features>
<server>
@@ -77,7 +77,7 @@ CURL_NTLM_AUTH_SRCDIR=%SRCDIR
CURL_NTLM_AUTH_TESTNUM=1310
</setenv>
<command>
-http://%HOSTIP:%HTTPPORT/1310 -u testuser:anypasswd --ntlm-sso
+http://%HOSTIP:%HTTPPORT/1310 -u testuser:anypasswd --ntlm-wb
</command>
<precheck>
chkhostname curlhost
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 7ea269b2b..304021feb 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -203,7 +203,7 @@ my $has_ipv6; # set if libcurl is built with IPv6 support
my $has_libz; # set if libcurl is built with libz support
my $has_getrlimit; # set if system has getrlimit()
my $has_ntlm; # set if libcurl is built with NTLM support
-my $has_ntlm_sso; # set if libcurl is built with NTLM single-sign-on support
+my $has_ntlm_wb; # set if libcurl is built with NTLM delegation to winbind
my $has_charconv;# set if libcurl is built with CharConv support
my $has_tls_srp; # set if libcurl is built with TLS-SRP support
@@ -2174,9 +2174,9 @@ sub checksystem {
# NTLM enabled
$has_ntlm=1;
}
- if($feat =~ /NTLM_SSO/i) {
- # NTLM single-sign-on enabled
- $has_ntlm_sso=1;
+ if($feat =~ /NTLM_WB/i) {
+ # NTLM delegation to winbind daemon ntlm_auth helper enabled
+ $has_ntlm_wb=1;
}
if($feat =~ /CharConv/i) {
# CharConv enabled
@@ -2526,8 +2526,8 @@ sub singletest {
next;
}
}
- elsif($f eq "NTLM_SSO") {
- if($has_ntlm_sso) {
+ elsif($f eq "NTLM_WB") {
+ if($has_ntlm_wb) {
next;
}
}
--
cgit v1.2.3