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

curl.h/features: Deprecate GSS-Negotiate macros due to bad naming

Browse source 
- Replace CURLAUTH_GSSNEGOTIATE with CURLAUTH_NEGOTIATE
- CURL_VERSION_GSSNEGOTIATE is deprecated which
  is served by CURL_VERSION_SSPI, CURL_VERSION_GSSAPI and
  CURUL_VERSION_SPNEGO now.
- Remove display of feature 'GSS-Negotiate'
This commit is contained in:
Michael Osipov 2014-07-21 09:53:46 +02:00 • committed by Daniel Stenberg
parent 46750c39bd
commit e38ba43014
10 changed files with 40 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/tool_getparam.c
View file

@ -597,13 +597,13 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
case 'l': /* --negotiate */
if(toggle) {
if(curlinfo->features & CURL_VERSION_GSSNEGOTIATE)
config->authtype |= CURLAUTH_GSSNEGOTIATE;
if(curlinfo->features & CURL_VERSION_SPNEGO)
config->authtype |= CURLAUTH_NEGOTIATE;
else
return PARAM_LIBCURL_DOESNT_SUPPORT;
}
else
config->authtype &= ~CURLAUTH_GSSNEGOTIATE;
config->authtype &= ~CURLAUTH_NEGOTIATE;
break;
case 'm': /* --ntlm */
@ -697,8 +697,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
break;
case 'x': /* --krb */
/* kerberos level string */
if(curlinfo->features & (CURL_VERSION_KERBEROS4 |
CURL_VERSION_GSSNEGOTIATE))
if(curlinfo->features & CURL_VERSION_KERBEROS4)
GetStr(&config->krblevel, nextarg);
else
return PARAM_LIBCURL_DOESNT_SUPPORT;
@ -798,11 +797,12 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
break;
case 'k': /* --proxy-negotiate */
if(curlinfo->features & CURL_VERSION_GSSNEGOTIATE)
if(curlinfo->features & CURL_VERSION_SPNEGO)
config->proxynegotiate = toggle;
else
return PARAM_LIBCURL_DOESNT_SUPPORT;
break;
case 'm': /* --ftp-account */
GetStr(&config->ftp_account, nextarg);
break;