aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/version.c28
1 files changed, 22 insertions, 6 deletions
diff --git a/lib/version.c b/lib/version.c
index c56ad3962..2a2c5c0d2 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -64,10 +64,16 @@
char *curl_version(void)
{
static char version[200];
- char *ptr=version;
+ char *ptr = version;
size_t len;
size_t left = sizeof(version);
- strcpy(ptr, LIBCURL_NAME "/" LIBCURL_VERSION );
+#ifdef USE_WINDOWS_SSPI
+#ifndef USE_SCHANNEL
+ int sspi_major = 0, sspi_minor = 0, sspi_build = 0;
+#endif
+#endif
+
+ strcpy(ptr, LIBCURL_NAME "/" LIBCURL_VERSION);
len = strlen(ptr);
left -= len;
ptr += len;
@@ -82,6 +88,19 @@ char *curl_version(void)
}
}
+#ifdef USE_WINDOWS_SSPI
+#ifndef USE_SCHANNEL
+ if(CURLE_OK == Curl_sspi_version(&sspi_major, &sspi_minor, &sspi_build,
+ NULL))
+ len = snprintf(ptr, left, " WinSSPI/%d.%d.%d", sspi_major, sspi_minor,
+ sspi_build);
+ else
+ len = snprintf(ptr, left, " WinSSPI/unknown");
+
+ left -= len;
+ ptr += len;
+#endif
+#endif
#ifdef HAVE_LIBZ
len = snprintf(ptr, left, " zlib/%s", zlibVersion());
left -= len;
@@ -243,9 +262,6 @@ 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