romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 01:33:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

NTLM single-sign on adjustments (XI)

Browse source 
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.
This commit is contained in:
Yang Tse 2011-08-27 01:32:49 +02:00
parent e18c3f447e
commit b4f6319cf7
10 changed files with 27 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/data/test1310
View file

@ -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

12
tests/runtests.pl
View file

@ -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;
}
}