diff options
| -rw-r--r-- | docs/libcurl/curl_version_info.3 | 7 | ||||
| -rw-r--r-- | docs/libcurl/symbols-in-versions | 1 | ||||
| -rw-r--r-- | include/curl/curl.h | 1 | ||||
| -rw-r--r-- | lib/version.c | 4 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 2 |
5 files changed, 13 insertions, 2 deletions
diff --git a/docs/libcurl/curl_version_info.3 b/docs/libcurl/curl_version_info.3 index 681d1a611..3acf7851b 100644 --- a/docs/libcurl/curl_version_info.3 +++ b/docs/libcurl/curl_version_info.3 @@ -20,7 +20,7 @@ .\" * .\" ************************************************************************** .\" -.TH curl_version_info 3 "2 Aug 2014" "libcurl 7.38.0" "libcurl Manual" +.TH curl_version_info 3 "2 Nov 2014" "libcurl 7.40.0" "libcurl Manual" .SH NAME curl_version_info - returns run-time libcurl version info .SH SYNOPSIS @@ -96,7 +96,10 @@ bits are: .IP CURL_VERSION_IPV6 supports IPv6 .IP CURL_VERSION_KERBEROS4 -supports kerberos4 (when using FTP) +supports Kerberos V4 (when using FTP) +.IP CURL_VERSION_KERBEROS5 +supports Kerberos V5 authentication for FTP, IMAP, POP3, SMTP and SOCKSv5 proxy +(Added in 7.40.0) .IP CURL_VERSION_SSL supports SSL (HTTPS/FTPS) (Added in 7.10) .IP CURL_VERSION_LIBZ diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index c86a0a006..8e4ca9cea 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -738,6 +738,7 @@ CURL_VERSION_HTTP2 7.33.0 CURL_VERSION_IDN 7.12.0 CURL_VERSION_IPV6 7.10 CURL_VERSION_KERBEROS4 7.10 7.33.0 +CURL_VERSION_KERBEROS5 7.40.0 CURL_VERSION_LARGEFILE 7.11.1 CURL_VERSION_LIBZ 7.10 CURL_VERSION_NTLM 7.10.6 diff --git a/include/curl/curl.h b/include/curl/curl.h index 36673c324..5137f11d8 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -2261,6 +2261,7 @@ typedef struct { #define CURL_VERSION_NTLM_WB (1<<15) /* NTLM delegating to winbind helper */ #define CURL_VERSION_HTTP2 (1<<16) /* HTTP2 support built-in */ #define CURL_VERSION_GSSAPI (1<<17) /* GSS-API is supported */ +#define CURL_VERSION_KERBEROS5 (1<<18) /* Kerberos V5 auth is supported */ /* * NAME curl_version_info() diff --git a/lib/version.c b/lib/version.c index 788f3e9d1..5da46665b 100644 --- a/lib/version.c +++ b/lib/version.c @@ -253,7 +253,11 @@ static curl_version_info_data version_info = { #ifdef USE_SPNEGO | CURL_VERSION_SPNEGO #endif +#ifdef USE_KRB5 + | CURL_VERSION_KERBEROS5 +#endif #ifdef HAVE_GSSAPI + | CURL_VERSION_KERBEROS5 /* Remove when SASL Kerberos V5 support added */ | CURL_VERSION_GSSAPI #endif #ifdef USE_WINDOWS_SSPI diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 39adc6a12..2f6d86abc 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -119,6 +119,8 @@ d c X'00010000' d CURL_VERSION_GSSAPI... d c X'00020000' + d CURL_VERSION_KERBEROS5... + d c X'00040000' * d HTTPPOST_FILENAME... d c X'00000001' |