[PATCH 2/2] http: use a feature check to enable GSSAPI delegation control
- From
Tom G. Christensen <tgc@jupiterrise.com>
- Date
- Aug 11, 2017, 16:37 UTC
- Message-ID
- <b037d7116bb6eac965a5cba2357611b156c07b8d.1502462884.git.tgc@jupiterrise.com>
- In-Reply-To
- <cover.1502462884.git.tgc@jupiterrise.com>
Turn the version check into a feature check to ensure this functionality is also enabled with vendor supported curl versions where the feature may have been backported.
Signed-off-by: Tom G. Christensen <tgc@jupiterrise.com> --- http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/http.c b/http.c index 569909e8a..a3ae58f13 100644 --- a/http.c +++ b/http.c @@ -91,7 +91,7 @@ static struct { * here, too */ }; -#if LIBCURL_VERSION_NUM >= 0x071600 +#ifdef CURLGSSAPI_DELEGATION_FLAG static const char *curl_deleg; static struct { const char *name; @@ -356,7 +356,7 @@ static int http_options(const char *var, const char *value, void *cb) } if (!strcmp("http.delegation", var)) { -#if LIBCURL_VERSION_NUM >= 0x071600 +#ifdef CURLGSSAPI_DELEGATION_FLAG return git_config_string(&curl_deleg, var, value); #else warning(_("Delegation control is not supported with cURL < 7.22.0")); @@ -727,7 +727,7 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY); #endif -#if LIBCURL_VERSION_NUM >= 0x071600 +#ifdef CURLGSSAPI_DELEGATION_FLAG if (curl_deleg) { int i; for (i = 0; i < ARRAY_SIZE(curl_deleg_levels); i++) {
-- 2.14.1