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

kerberos: Use symbol qualified with _KERBEROS5

Browse Source 
For consistency renamed USE_KRB5 to USE_KERBEROS5.
This commit is contained in:
Michael Osipov
2014-11-16 09:50:06 +00:00
committed by Steve Holme
parent a607f8a20c
commit 9f10e45e42
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/curl_sasl.c
View File

@@ -1250,7 +1250,7 @@ CURLcode Curl_sasl_create_xoauth2_message(struct SessionHandle *data,
*/ */
void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused) void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused)
{ {
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
/* Cleanup the gssapi structure */ /* Cleanup the gssapi structure */
if(authused == SASL_MECH_GSSAPI) { if(authused == SASL_MECH_GSSAPI) {
Curl_sasl_gssapi_cleanup(&conn->krb5); Curl_sasl_gssapi_cleanup(&conn->krb5);
@@ -1264,7 +1264,7 @@ void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused)
} }
#endif #endif
#if !defined(USE_KRB5) && !defined(USE_NTLM) #if !defined(USE_KERBEROS5) && !defined(USE_NTLM)
/* Reserved for future use */ /* Reserved for future use */
(void)conn; (void)conn;
(void)authused; (void)authused;

6
lib/curl_sasl.h
View File

@@ -35,7 +35,7 @@ struct digestdata;
struct ntlmdata; struct ntlmdata;
#endif #endif
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
struct kerberos5data; struct kerberos5data;
#endif #endif
@@ -154,7 +154,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm);
#endif /* USE_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 /* This is used to generate a base64 encoded GSSAPI (Kerberos V5) user token
message */ message */
CURLcode Curl_sasl_create_gssapi_user_message(struct SessionHandle *data, 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 */ /* This is used to clean up the gssapi specific data */
void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5); 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 /* This is used to generate a base64 encoded XOAUTH2 authentication message
containing the user name and bearer token */ containing the user name and bearer token */

4
lib/curl_sasl_sspi.c
View File

@@ -599,7 +599,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm)
} }
#endif /* USE_NTLM */ #endif /* USE_NTLM */
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
/* /*
* Curl_sasl_create_gssapi_user_message() * Curl_sasl_create_gssapi_user_message()
* *
@@ -1043,6 +1043,6 @@ void Curl_sasl_gssapi_cleanup(struct kerberos5data *krb5)
/* Reset any variables */ /* Reset any variables */
krb5->token_max = 0; krb5->token_max = 0;
} }
#endif /* USE_KRB5 */ #endif /* USE_KERBEROS5 */
#endif /* USE_WINDOWS_SSPI */ #endif /* USE_WINDOWS_SSPI */

4
lib/curl_setup.h
View File

@@ -614,9 +614,9 @@ int netware_init(void);
#define USE_SPNEGO #define USE_SPNEGO
#endif #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) #if !defined(CURL_DISABLE_CRYPTO_AUTH) && defined(USE_WINDOWS_SSPI)
#define USE_KRB5 #define USE_KERBEROS5
#endif #endif
/* Single point where USE_NTLM definition might be defined */ /* Single point where USE_NTLM definition might be defined */

6
lib/imap.c
View File

@@ -1300,7 +1300,7 @@ static CURLcode imap_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
} }
#endif #endif
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
/* For AUTHENTICATE GSSAPI (without initial response) responses */ /* For AUTHENTICATE GSSAPI (without initial response) responses */
static CURLcode imap_state_auth_gssapi_resp(struct connectdata *conn, static CURLcode imap_state_auth_gssapi_resp(struct connectdata *conn,
int imapcode, int imapcode,
@@ -1911,7 +1911,7 @@ static CURLcode imap_statemach_act(struct connectdata *conn)
break; break;
#endif #endif
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
case IMAP_AUTHENTICATE_GSSAPI: case IMAP_AUTHENTICATE_GSSAPI:
result = imap_state_auth_gssapi_resp(conn, imapcode, imapc->state); result = imap_state_auth_gssapi_resp(conn, imapcode, imapc->state);
break; break;
@@ -2803,7 +2803,7 @@ static CURLcode imap_calc_sasl_details(struct connectdata *conn,
/* Calculate the supported authentication mechanism, by decreasing order of /* Calculate the supported authentication mechanism, by decreasing order of
security, as well as the initial response where appropriate */ security, as well as the initial response where appropriate */
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
if((imapc->authmechs & SASL_MECH_GSSAPI) && if((imapc->authmechs & SASL_MECH_GSSAPI) &&
(imapc->prefmech & SASL_MECH_GSSAPI)) { (imapc->prefmech & SASL_MECH_GSSAPI)) {
imapc->mutual_auth = FALSE; /* TODO: Calculate mutual authentication */ imapc->mutual_auth = FALSE; /* TODO: Calculate mutual authentication */

6
lib/pop3.c
View File

@@ -1131,7 +1131,7 @@ static CURLcode pop3_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
} }
#endif #endif
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
/* For AUTH GSSAPI (without initial response) responses */ /* For AUTH GSSAPI (without initial response) responses */
static CURLcode pop3_state_auth_gssapi_resp(struct connectdata *conn, static CURLcode pop3_state_auth_gssapi_resp(struct connectdata *conn,
int pop3code, int pop3code,
@@ -1591,7 +1591,7 @@ static CURLcode pop3_statemach_act(struct connectdata *conn)
break; break;
#endif #endif
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
case POP3_AUTH_GSSAPI: case POP3_AUTH_GSSAPI:
result = pop3_state_auth_gssapi_resp(conn, pop3code, pop3c->state); result = pop3_state_auth_gssapi_resp(conn, pop3code, pop3c->state);
break; break;
@@ -2121,7 +2121,7 @@ static CURLcode pop3_calc_sasl_details(struct connectdata *conn,
/* Calculate the supported authentication mechanism, by decreasing order of /* Calculate the supported authentication mechanism, by decreasing order of
security, as well as the initial response where appropriate */ security, as well as the initial response where appropriate */
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
if((pop3c->authmechs & SASL_MECH_GSSAPI) && if((pop3c->authmechs & SASL_MECH_GSSAPI) &&
(pop3c->prefmech & SASL_MECH_GSSAPI)) { (pop3c->prefmech & SASL_MECH_GSSAPI)) {
pop3c->mutual_auth = FALSE; /* TODO: Calculate mutual authentication */ pop3c->mutual_auth = FALSE; /* TODO: Calculate mutual authentication */

6
lib/smtp.c
View File

@@ -1150,7 +1150,7 @@ static CURLcode smtp_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
} }
#endif #endif
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
/* For AUTH GSSAPI (without initial response) responses */ /* For AUTH GSSAPI (without initial response) responses */
static CURLcode smtp_state_auth_gssapi_resp(struct connectdata *conn, static CURLcode smtp_state_auth_gssapi_resp(struct connectdata *conn,
int smtpcode, int smtpcode,
@@ -1630,7 +1630,7 @@ static CURLcode smtp_statemach_act(struct connectdata *conn)
break; break;
#endif #endif
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
case SMTP_AUTH_GSSAPI: case SMTP_AUTH_GSSAPI:
result = smtp_state_auth_gssapi_resp(conn, smtpcode, smtpc->state); result = smtp_state_auth_gssapi_resp(conn, smtpcode, smtpc->state);
break; break;
@@ -2221,7 +2221,7 @@ static CURLcode smtp_calc_sasl_details(struct connectdata *conn,
/* Calculate the supported authentication mechanism, by decreasing order of /* Calculate the supported authentication mechanism, by decreasing order of
security, as well as the initial response where appropriate */ security, as well as the initial response where appropriate */
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
if((smtpc->authmechs & SASL_MECH_GSSAPI) && if((smtpc->authmechs & SASL_MECH_GSSAPI) &&
(smtpc->prefmech & SASL_MECH_GSSAPI)) { (smtpc->prefmech & SASL_MECH_GSSAPI)) {
smtpc->mutual_auth = FALSE; /* TODO: Calculate mutual authentication */ smtpc->mutual_auth = FALSE; /* TODO: Calculate mutual authentication */

4
lib/urldata.h
View File

@@ -424,7 +424,7 @@ typedef enum {
#endif #endif
/* Struct used for GSSAPI (Kerberos V5) authentication */ /* Struct used for GSSAPI (Kerberos V5) authentication */
#if defined(USE_KRB5) #if defined(USE_KERBEROS5)
struct kerberos5data { struct kerberos5data {
CredHandle *credentials; CredHandle *credentials;
CtxtHandle *context; CtxtHandle *context;
@@ -985,7 +985,7 @@ struct connectdata {
struct sockaddr_in local_addr; struct sockaddr_in local_addr;
#endif #endif
#if defined(USE_KRB5) /* Consider moving some of the above GSS-API */ #if defined(USE_KERBEROS5) /* Consider moving some of the above GSS-API */
struct kerberos5data krb5; /* variables into the structure definition, */ struct kerberos5data krb5; /* variables into the structure definition, */
#endif /* however, some of them are ftp specific. */ #endif /* however, some of them are ftp specific. */

2
lib/version.c
View File

@@ -254,7 +254,7 @@ static curl_version_info_data version_info = {
#ifdef USE_SPNEGO #ifdef USE_SPNEGO
| CURL_VERSION_SPNEGO | CURL_VERSION_SPNEGO
#endif #endif
#ifdef USE_KRB5 #ifdef USE_KERBEROS5
| CURL_VERSION_KERBEROS5 | CURL_VERSION_KERBEROS5
#endif #endif
#ifdef HAVE_GSSAPI #ifdef HAVE_GSSAPI