summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorTom G. Christensen <tgc@jupiterrise.com>2017-08-11 16:37:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-11 22:12:41 (GMT)
commitdd5df538b501661f60ffed3eb8486b9eed138c48 (patch)
tree086aa99b86ea5cf78b793e8e3321bb26aca59514 /http.c
parentf18777ba6ef23c30c68d2d4799b6ba512785288f (diff)
downloadgit-dd5df538b501661f60ffed3eb8486b9eed138c48.zip
git-dd5df538b501661f60ffed3eb8486b9eed138c48.tar.gz
git-dd5df538b501661f60ffed3eb8486b9eed138c48.tar.bz2
http: use a feature check to enable GSSAPI delegation control
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r--http.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/http.c b/http.c
index d49068f..e24725f 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;
@@ -352,7 +352,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"));
@@ -719,7 +719,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++) {