sasl_gssapi: Enable USE_KERBEROS5 for GSS-API based builds

diff --git a/lib/curl_sasl_gssapi.c b/lib/curl_sasl_gssapi.c
index 0011b4f727d5c353b9038339740105504f653713..24a2f452e5dba36998b66bc7abab2b69c24df5a4 100644 (file)
--- 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 e916226c706d0585c0434e247f3d63db618fadad..a8285598906d9057a104a06974af954af7592e75 100644 (file)
--- 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 0eb229bc63307b11fbd3139fb2b73559e3aca35b..93317e19b8ef994849bce13e793c06f47c6f1848 100644 (file)
--- 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