From 9f10e45e428ca3b30d42719cda8c7f3159c3bd15 Mon Sep 17 00:00:00 2001
From: Michael Osipov <1983-01-06@gmx.net>
Date: Sun, 16 Nov 2014 09:50:06 +0000
Subject: [PATCH] kerberos: Use symbol qualified with _KERBEROS5

For consistency renamed USE_KRB5 to USE_KERBEROS5.
---
 lib/curl_sasl.c      | 4 ++--
 lib/curl_sasl.h      | 6 +++---
 lib/curl_sasl_sspi.c | 4 ++--
 lib/curl_setup.h     | 4 ++--
 lib/imap.c           | 6 +++---
 lib/pop3.c           | 6 +++---
 lib/smtp.c           | 6 +++---
 lib/urldata.h        | 4 ++--
 lib/version.c        | 2 +-
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 1e2b216f9..47766a705 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -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;
diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h
index 26d94296c..41ef859a2 100644
--- a/lib/curl_sasl.h
+++ b/lib/curl_sasl.h
@@ -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 */
diff --git a/lib/curl_sasl_sspi.c b/lib/curl_sasl_sspi.c
index 6b8e67366..b3fb96c3c 100644
--- a/lib/curl_sasl_sspi.c
+++ b/lib/curl_sasl_sspi.c
@@ -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 */
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 7dcbd0720..e916226c7 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -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 */
diff --git a/lib/imap.c b/lib/imap.c
index 4a0419a18..cd96cd804 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -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 */
diff --git a/lib/pop3.c b/lib/pop3.c
index 03d737ef2..9c6cc8b36 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1131,7 +1131,7 @@ static CURLcode pop3_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
 }
 #endif
 
-#if defined(USE_KRB5)
+#if defined(USE_KERBEROS5)
 /* For AUTH GSSAPI (without initial response) responses */
 static CURLcode pop3_state_auth_gssapi_resp(struct connectdata *conn,
                                             int pop3code,
@@ -1591,7 +1591,7 @@ static CURLcode pop3_statemach_act(struct connectdata *conn)
       break;
 #endif
 
-#if defined(USE_KRB5)
+#if defined(USE_KERBEROS5)
     case POP3_AUTH_GSSAPI:
       result = pop3_state_auth_gssapi_resp(conn, pop3code, pop3c->state);
       break;
@@ -2121,7 +2121,7 @@ static CURLcode pop3_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((pop3c->authmechs & SASL_MECH_GSSAPI) &&
       (pop3c->prefmech & SASL_MECH_GSSAPI)) {
     pop3c->mutual_auth = FALSE; /* TODO: Calculate mutual authentication */
diff --git a/lib/smtp.c b/lib/smtp.c
index 448b040c7..5f6524357 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1150,7 +1150,7 @@ static CURLcode smtp_state_auth_ntlm_type2msg_resp(struct connectdata *conn,
 }
 #endif
 
-#if defined(USE_KRB5)
+#if defined(USE_KERBEROS5)
 /* For AUTH GSSAPI (without initial response) responses */
 static CURLcode smtp_state_auth_gssapi_resp(struct connectdata *conn,
                                             int smtpcode,
@@ -1630,7 +1630,7 @@ static CURLcode smtp_statemach_act(struct connectdata *conn)
       break;
 #endif
 
-#if defined(USE_KRB5)
+#if defined(USE_KERBEROS5)
     case SMTP_AUTH_GSSAPI:
       result = smtp_state_auth_gssapi_resp(conn, smtpcode, smtpc->state);
       break;
@@ -2221,7 +2221,7 @@ static CURLcode smtp_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((smtpc->authmechs & SASL_MECH_GSSAPI) &&
      (smtpc->prefmech & SASL_MECH_GSSAPI)) {
     smtpc->mutual_auth = FALSE; /* TODO: Calculate mutual authentication */
diff --git a/lib/urldata.h b/lib/urldata.h
index f5e8a783f..d0746b41f 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -424,7 +424,7 @@ typedef enum {
 #endif
 
 /* Struct used for GSSAPI (Kerberos V5) authentication */
-#if defined(USE_KRB5)
+#if defined(USE_KERBEROS5)
 struct kerberos5data {
   CredHandle *credentials;
   CtxtHandle *context;
@@ -985,7 +985,7 @@ struct connectdata {
   struct sockaddr_in local_addr;
 #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, */
 #endif                        /* however, some of them are ftp specific. */
 
diff --git a/lib/version.c b/lib/version.c
index e34bb0464..1ea8a21e8 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -254,7 +254,7 @@ static curl_version_info_data version_info = {
 #ifdef USE_SPNEGO
   | CURL_VERSION_SPNEGO
 #endif
-#ifdef USE_KRB5
+#ifdef USE_KERBEROS5
   | CURL_VERSION_KERBEROS5
 #endif
 #ifdef HAVE_GSSAPI