Commit 884df3a5 authored by Steve Holme's avatar Steve Holme
Browse files

sasl_gssapi: Enable USE_KERBEROS5 for GSS-API based builds

parent 86b88948

lib/curl_sasl_gssapi.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

lib/curl_setup.h

+2 −1
Original line number Diff line number Diff line
@@ -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

lib/version.c

+0 −1
Original line number Diff line number Diff line
@@ -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