diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2012-06-11 22:58:39 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-06-11 22:58:39 +0200 |
| commit | af0888aaf6b444388d9b2770e310e9ef48354515 (patch) | |
| tree | 34931ab97244cc63183c731c0d8816b6d95e53eb | |
| parent | 9c18bb3702419610fa4400a674f228205931c5c1 (diff) | |
| download | curl-af0888aaf6b444388d9b2770e310e9ef48354515.tar.gz | |
Revert: 634f7cfee40d4658 partially
Make sure CURL_VERSION_SSPI is present and works as in previous releases
for ABI and API compatibility reasons.
| -rw-r--r-- | include/curl/curl.h | 2 | ||||
| -rw-r--r-- | lib/version.c | 3 | ||||
| -rw-r--r-- | src/tool_getparam.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 2c743b454..2cad28298 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -2144,7 +2144,7 @@ typedef struct { #define CURL_VERSION_SPNEGO (1<<8) /* SPNEGO auth */ #define CURL_VERSION_LARGEFILE (1<<9) /* supports files bigger than 2GB */ #define CURL_VERSION_IDN (1<<10) /* International Domain Names support */ -#define CURL_VERSION_OBSOLETE11 (1<<11) /* NOT USED - removed in 7.27.0 */ +#define CURL_VERSION_SSPI (1<<11) /* SSPI is supported */ #define CURL_VERSION_CONV (1<<12) /* character conversions supported */ #define CURL_VERSION_CURLDEBUG (1<<13) /* debug memory tracking supported */ #define CURL_VERSION_TLSAUTH_SRP (1<<14) /* TLS-SRP auth is supported */ diff --git a/lib/version.c b/lib/version.c index 2a2c5c0d2..9f9fc78b1 100644 --- a/lib/version.c +++ b/lib/version.c @@ -262,6 +262,9 @@ static curl_version_info_data version_info = { #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED) | CURL_VERSION_NTLM_WB #endif +#ifdef USE_WINDOWS_SSPI + | CURL_VERSION_SSPI +#endif #ifdef HAVE_LIBZ | CURL_VERSION_LIBZ #endif diff --git a/src/tool_getparam.c b/src/tool_getparam.c index fb42d0acc..ab8ed1d5e 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -277,6 +277,7 @@ static const struct feat feats[] = { {"NTLM_WB", CURL_VERSION_NTLM_WB}, {"SPNEGO", CURL_VERSION_SPNEGO}, {"SSL", CURL_VERSION_SSL}, + {"SSPI", CURL_VERSION_SSPI}, {"krb4", CURL_VERSION_KERBEROS4}, {"libz", CURL_VERSION_LIBZ}, {"CharConv", CURL_VERSION_CONV}, |