generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sasl_gssapi: Enable USE_KERBEROS5 for GSS-API based builds

Browse Source
This commit is contained in:
Steve Holme
2014-12-03 07:13:30 +00:00
parent 86b889485d
commit 884df3a51f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/curl_sasl_gssapi.c
View File

@@ -24,7 +24,7 @@
#include "curl_setup.h" #include "curl_setup.h"
#if defined(HAVE_GSSAPI) && defined(USE_KRB5) #if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5)
#include <curl/curl.h> #include <curl/curl.h>
@@ -116,4 +116,4 @@ void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5)
(void) krb5; (void) krb5;
} }
#endif /* HAVE_GSSAPI && USE_KRB5 */ #endif /* HAVE_GSSAPI && USE_KERBEROS5 */

3
lib/curl_setup.h
View File

@@ -615,7 +615,8 @@ int netware_init(void);
#endif #endif
/* Single point where USE_KERBEROS5 definition might be defined */ /* 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 #define USE_KERBEROS5
#endif #endif

1
lib/version.c
View File

@@ -265,7 +265,6 @@ static curl_version_info_data version_info = {
| CURL_VERSION_KERBEROS5 | CURL_VERSION_KERBEROS5
#endif #endif
#ifdef HAVE_GSSAPI #ifdef HAVE_GSSAPI
| CURL_VERSION_KERBEROS5 /* Remove when SASL Kerberos V5 support added */
| CURL_VERSION_GSSAPI | CURL_VERSION_GSSAPI
#endif #endif
#ifdef USE_WINDOWS_SSPI #ifdef USE_WINDOWS_SSPI