aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-12-03 07:13:30 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-12-03 13:16:17 +0000
commit884df3a51f2f9ff3d4aebbe86d3971d9202d3f11 (patch)
treed32b1a4aaa344b96cfa2a23d405c5003a14f521c
parent86b889485d739fb1884d5beb3b1f359e36d0d072 (diff)
sasl_gssapi: Enable USE_KERBEROS5 for GSS-API based builds
-rw-r--r--lib/curl_sasl_gssapi.c4
-rw-r--r--lib/curl_setup.h3
-rw-r--r--lib/version.c1
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/curl_sasl_gssapi.c b/lib/curl_sasl_gssapi.c
index 0011b4f72..24a2f452e 100644
--- a/lib/curl_sasl_gssapi.c
+++ b/lib/curl_sasl_gssapi.c
@@ -24,7 +24,7 @@
#include "curl_setup.h"
-#if defined(HAVE_GSSAPI) && defined(USE_KRB5)
+#if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5)
#include <curl/curl.h>
@@ -116,4 +116,4 @@ void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5)
(void) krb5;
}
-#endif /* HAVE_GSSAPI && USE_KRB5 */
+#endif /* HAVE_GSSAPI && USE_KERBEROS5 */
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index e916226c7..a82855989 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -615,7 +615,8 @@ int netware_init(void);
#endif
/* Single point where USE_KERBEROS5 definition might be defined */
-#if !defined(CURL_DISABLE_CRYPTO_AUTH) && defined(USE_WINDOWS_SSPI)
+#if !defined(CURL_DISABLE_CRYPTO_AUTH) && \
+ (defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI))
#define USE_KERBEROS5
#endif
diff --git a/lib/version.c b/lib/version.c
index 0eb229bc6..93317e19b 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -265,7 +265,6 @@ static curl_version_info_data version_info = {
| 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