diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-04-23 16:28:01 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-04-23 16:28:01 +0200 |
| commit | d6c449e3b4262aa29c1594d64379a8c26d9a5c38 (patch) | |
| tree | 020e22930ac9dfc4c926fbe43f6fd880ad962e11 /lib/version.c | |
| parent | 071f8d4182ec86b236404e0af3dadfd0bf3270c8 (diff) | |
| download | curl-d6c449e3b4262aa29c1594d64379a8c26d9a5c38.tar.gz | |
Revert "sspi: Added version information"
This reverts commit 2976de480808119dae08fc6f52c8d75ba1aedb1a.
Diffstat (limited to 'lib/version.c')
| -rw-r--r-- | lib/version.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/lib/version.c b/lib/version.c index 38da9f14d..c56ad3962 100644 --- a/lib/version.c +++ b/lib/version.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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,16 +64,10 @@ char *curl_version(void) { static char version[200]; - char *ptr = version; + char *ptr=version; size_t len; size_t left = sizeof(version); -#ifdef USE_WINDOWS_SSPI - int sspi_major = 0; - int sspi_minor = 0; - int sspi_build = 0; -#endif; - - strcpy(ptr, LIBCURL_NAME "/" LIBCURL_VERSION); + strcpy(ptr, LIBCURL_NAME "/" LIBCURL_VERSION ); len = strlen(ptr); left -= len; ptr += len; @@ -88,17 +82,6 @@ char *curl_version(void) } } -#ifdef USE_WINDOWS_SSPI - if(CURLE_OK == Curl_sspi_version(&sspi_major, &sspi_minor, &sspi_build, - NULL)) - len = snprintf(ptr, left, " sspi/%d.%d.%d", sspi_major, sspi_minor, - sspi_build); - else - len = snprintf(ptr, left, " sspi/unknown"); - - left -= len; - ptr += len; -#endif #ifdef HAVE_LIBZ len = snprintf(ptr, left, " zlib/%s", zlibVersion()); left -= len; @@ -260,6 +243,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 |