curl-library
[PATCH 3/6] Add feature and version info for GSS-API (like with SSPI)
From: Michael Osipov <1983-01-06_at_gmx.net>
Date: Thu, 17 Jul 2014 15:47:26 +0200
Date: Thu, 17 Jul 2014 15:47:26 +0200
--- configure.ac | 2 +- include/curl/curl.h | 1 + lib/version.c | 3 +++ src/tool_help.c | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c3cccfb..e289aa9 100644 --- a/configure.ac +++ b/configure.ac @@ -3370,7 +3370,7 @@ fi if test "x$USE_NGHTTP2" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP2" fi -if test "x$want_gss" = "xyes"; then +if test "x$HAVE_GSSAPI" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES GSS-API" fi diff --git a/include/curl/curl.h b/include/curl/curl.h index 4e981fc..ce80e40 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -2243,6 +2243,7 @@ typedef struct { #define CURL_VERSION_TLSAUTH_SRP (1<<14) /* TLS-SRP auth is supported */ #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 */ /* * NAME curl_version_info() diff --git a/lib/version.c b/lib/version.c index c25b55b..3d26a54 100644 --- a/lib/version.c +++ b/lib/version.c @@ -281,6 +281,9 @@ static curl_version_info_data version_info = { #if defined(USE_NGHTTP2) | CURL_VERSION_HTTP2 #endif +#ifdef HAVE_GSSAPI + | CURL_VERSION_GSSAPI +#endif , NULL, /* ssl_version */ 0, /* ssl_version_num, this is kept at zero */ diff --git a/src/tool_help.c b/src/tool_help.c index 7935298..54817e4 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -270,7 +270,8 @@ static const struct feat feats[] = { {"libz", CURL_VERSION_LIBZ}, {"CharConv", CURL_VERSION_CONV}, {"TLS-SRP", CURL_VERSION_TLSAUTH_SRP}, - {"HTTP2", CURL_VERSION_HTTP2} + {"HTTP2", CURL_VERSION_HTTP2}, + {"GSS-API", CURL_VERSION_GSSAPI} }; void tool_help(void) -- 2.0.0 ------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.htmlReceived on 2014-07-17