aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--include/curl/curl.h1
-rw-r--r--lib/version.c5
-rw-r--r--src/main.c1
4 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 2d686399b..031749f2f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@
Daniel (11 March 2005)
+- curl_version_info() returns the feature bit CURL_VERSION_SSPI if it was
+ built with SSPI support.
+
- Christopher R. Palmer made it possible to build libcurl with the
USE_WINDOWS_SSPI on Windows, and then libcurl will be built to use the
native way to do NTLM. SSPI also allows libcurl to pass on the current user
diff --git a/include/curl/curl.h b/include/curl/curl.h
index a8fb925b5..20f061145 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1382,6 +1382,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_SSPI (1<<11) /* SSPI is supported */
/*
* NAME curl_version_info()
diff --git a/lib/version.c b/lib/version.c
index e82eacf59..34741bb2b 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -196,7 +196,10 @@ static curl_version_info_data version_info = {
| CURL_VERSION_SSL
#endif
#if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI)
- | CURL_VERSION_NTLM /* since this requires OpenSSL */
+ | CURL_VERSION_NTLM
+#endif
+#ifdef USE_WINDOWS_SSPI
+ | CURL_VERSION_SSPI
#endif
#ifdef HAVE_LIBZ
| CURL_VERSION_LIBZ
diff --git a/src/main.c b/src/main.c
index 2d80e726f..0565abd42 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2098,6 +2098,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
{"NTLM", CURL_VERSION_NTLM},
{"SPNEGO", CURL_VERSION_SPNEGO},
{"SSL", CURL_VERSION_SSL},
+ {"SSPI", CURL_VERSION_SSPI},
{"krb4", CURL_VERSION_KERBEROS4},
{"libz", CURL_VERSION_LIBZ}
};