moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 09:08:49 -05:00
Code Issues Releases Wiki Activity

urldata: make service names unconditional

Browse Source 
The ifdefs have become quite long. Also, the condition for the
definition of CURLOPT_SERVICE_NAME and for setting it from
CURLOPT_SERVICE_NAME have diverged. We will soon also need the two
options for NTLM, at least when using SSPI, for
https://github.com/curl/curl/pull/1660.
Just make the definitions unconditional to make that easier.

Closes https://github.com/curl/curl/pull/2479
This commit is contained in:
Marcel Raad 2018-04-10 08:50:29 +02:00
parent 6cbe96975b
commit 627bd7da76
No known key found for this signature in database
GPG Key ID: 07ADACB610D796DA
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/setopt.c
View File

@ -1039,6 +1039,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option,
*/ */
data->set.socks5_gssapi_nec = (0 != va_arg(param, long)) ? TRUE : FALSE; data->set.socks5_gssapi_nec = (0 != va_arg(param, long)) ? TRUE : FALSE;
break; break;
#endif
case CURLOPT_SOCKS5_GSSAPI_SERVICE: case CURLOPT_SOCKS5_GSSAPI_SERVICE:
case CURLOPT_PROXY_SERVICE_NAME: case CURLOPT_PROXY_SERVICE_NAME:
@ -1048,10 +1049,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option,
result = Curl_setstropt(&data->set.str[STRING_PROXY_SERVICE_NAME], result = Curl_setstropt(&data->set.str[STRING_PROXY_SERVICE_NAME],
va_arg(param, char *)); va_arg(param, char *));
break; break;
#endif
#if !defined(CURL_DISABLE_CRYPTO_AUTH) || defined(USE_KERBEROS5) || \
defined(USE_SPNEGO)
case CURLOPT_SERVICE_NAME: case CURLOPT_SERVICE_NAME:
/* /*
* Set authentication service name for DIGEST-MD5, Kerberos 5 and SPNEGO * Set authentication service name for DIGEST-MD5, Kerberos 5 and SPNEGO
@ -1060,8 +1058,6 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option,
va_arg(param, char *)); va_arg(param, char *));
break; break;
#endif
case CURLOPT_HEADERDATA: case CURLOPT_HEADERDATA:
/* /*
* Custom pointer to pass the header write callback function * Custom pointer to pass the header write callback function

5
lib/urldata.h
View File

@ -1422,13 +1422,8 @@ enum dupstring {
STRING_SSH_HOST_PUBLIC_KEY_MD5, /* md5 of host public key in ascii hex */ STRING_SSH_HOST_PUBLIC_KEY_MD5, /* md5 of host public key in ascii hex */
STRING_SSH_KNOWNHOSTS, /* file name of knownhosts file */ STRING_SSH_KNOWNHOSTS, /* file name of knownhosts file */
#endif #endif
#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
STRING_PROXY_SERVICE_NAME, /* Proxy service name */ STRING_PROXY_SERVICE_NAME, /* Proxy service name */
#endif
#if !defined(CURL_DISABLE_CRYPTO_AUTH) || defined(USE_KERBEROS5) || \
defined(USE_SPNEGO) || defined(HAVE_GSSAPI)
STRING_SERVICE_NAME, /* Service name */ STRING_SERVICE_NAME, /* Service name */
#endif
STRING_MAIL_FROM, STRING_MAIL_FROM,
STRING_MAIL_AUTH, STRING_MAIL_AUTH,