Commit 9f10e45e authored by Michael Osipov's avatar Michael Osipov Committed by Steve Holme
Browse files

kerberos: Use symbol qualified with _KERBEROS5 

For consistency renamed USE_KRB5 to USE_KERBEROS5.
parent a607f8a2

lib/curl_sasl.c

+2 −2
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ CURLcode Curl_sasl_create_xoauth2_message(struct SessionHandle *data, 
 */

void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused)

{

#if defined(USE_KRB5)

#if defined(USE_KERBEROS5)

  /* Cleanup the gssapi structure */

  if(authused == SASL_MECH_GSSAPI) {

    Curl_sasl_gssapi_cleanup(&conn->krb5);
@@ -1264,7 +1264,7 @@ void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused) 
  }

#endif



#if !defined(USE_KRB5) && !defined(USE_NTLM)

#if !defined(USE_KERBEROS5) && !defined(USE_NTLM)

  /* Reserved for future use */

  (void)conn;

  (void)authused;

lib/curl_sasl.h

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct digestdata; 
struct ntlmdata;

#endif



#if defined(USE_KRB5)

#if defined(USE_KERBEROS5)

struct kerberos5data;

#endif
@@ -154,7 +154,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm); 


#endif /* USE_NTLM */



#if defined(USE_KRB5)

#if defined(USE_KERBEROS5)

/* This is used to generate a base64 encoded GSSAPI (Kerberos V5) user token

   message */

CURLcode Curl_sasl_create_gssapi_user_message(struct SessionHandle *data,
@@ -176,7 +176,7 @@ CURLcode Curl_sasl_create_gssapi_security_message(struct SessionHandle *data, 


/* This is used to clean up the gssapi specific data */

void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5);

#endif /* USE_KRB5 */

#endif /* USE_KERBEROS5 */



/* This is used to generate a base64 encoded XOAUTH2 authentication message

   containing the user name and bearer token */

lib/curl_sasl_sspi.c

+2 −2
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm) 
}

#endif /* USE_NTLM */



#if defined(USE_KRB5)

#if defined(USE_KERBEROS5)

/*

 * Curl_sasl_create_gssapi_user_message()

 *
@@ -1043,6 +1043,6 @@ void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5) 
  /* Reset any variables */

  krb5->token_max = 0;

}

#endif /* USE_KRB5 */

#endif /* USE_KERBEROS5 */



#endif /* USE_WINDOWS_SSPI */

lib/curl_setup.h

+2 −2
Original line number Diff line number Diff line
@@ -614,9 +614,9 @@ int netware_init(void); 
#define USE_SPNEGO

#endif



/* Single point where USE_KRB5 definition might be defined */

/* Single point where USE_KERBEROS5 definition might be defined */

#if !defined(CURL_DISABLE_CRYPTO_AUTH) && defined(USE_WINDOWS_SSPI)

#define USE_KRB5

#define USE_KERBEROS5

#endif



/* Single point where USE_NTLM definition might be defined */

lib/imap.c

+3 −3
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ static CURLcode imap_state_auth_ntlm_type2msg_resp(struct connectdata *conn, 
}

#endif



#if defined(USE_KRB5)

#if defined(USE_KERBEROS5)

/* For AUTHENTICATE GSSAPI (without initial response) responses */

static CURLcode imap_state_auth_gssapi_resp(struct connectdata *conn,

                                            int imapcode,
@@ -1911,7 +1911,7 @@ static CURLcode imap_statemach_act(struct connectdata *conn) 
      break;

#endif



#if defined(USE_KRB5)

#if defined(USE_KERBEROS5)

    case IMAP_AUTHENTICATE_GSSAPI:

      result = imap_state_auth_gssapi_resp(conn, imapcode, imapc->state);

      break;
@@ -2803,7 +2803,7 @@ static CURLcode imap_calc_sasl_details(struct connectdata *conn, 


  /* Calculate the supported authentication mechanism, by decreasing order of

     security, as well as the initial response where appropriate */

#if defined(USE_KRB5)

#if defined(USE_KERBEROS5)

    if((imapc->authmechs & SASL_MECH_GSSAPI) &&

       (imapc->prefmech & SASL_MECH_GSSAPI)) {

    imapc->mutual_auth = FALSE; /* TODO: Calculate mutual authentication */