s/GSS_EAP_NT_PRINCIPAL_NAME/GSS_EAP_NT_EAP_NAME

diff --git a/gssapi_eap.h b/gssapi_eap.h
index d61ce17..9f713ec 100644 (file)
--- a/gssapi_eap.h
+++ b/gssapi_eap.h
@@ -48,7 +48,7 @@ extern gss_OID GSS_EAP_AES256_CTS_HMAC_SHA1_96_MECHANISM;
 /*
  * Mechanism name OID.
  */
-extern gss_OID GSS_EAP_NT_PRINCIPAL_NAME;
+extern gss_OID GSS_EAP_NT_EAP_NAME;
 
 /*
  * The libradsec configuration file; defaults to radsec.conf

diff --git a/inquire_names_for_mech.c b/inquire_names_for_mech.c
index 8591c64..e01740a 100644 (file)
--- a/inquire_names_for_mech.c
+++ b/inquire_names_for_mech.c
@@ -49,7 +49,7 @@ gss_inquire_names_for_mech(OM_uint32 *minor,
 #ifdef HAVE_GSS_C_NT_COMPOSITE_EXPORT
         GSS_C_NT_COMPOSITE_EXPORT,
 #endif
-        GSS_EAP_NT_PRINCIPAL_NAME,
+        GSS_EAP_NT_EAP_NAME,
         GSS_C_NT_ANONYMOUS,
     };
     size_t i;

diff --git a/mech_eap.exports b/mech_eap.exports
index 2c2f09e..449f013 100644 (file)
--- a/mech_eap.exports
+++ b/mech_eap.exports
@@ -49,6 +49,6 @@ gss_wrap_iov_length
 gss_wrap_size_limit
 GSS_EAP_AES128_CTS_HMAC_SHA1_96_MECHANISM
 GSS_EAP_AES256_CTS_HMAC_SHA1_96_MECHANISM
-GSS_EAP_NT_PRINCIPAL_NAME
+GSS_EAP_NT_EAP_NAME
 gssspi_acquire_cred_with_password
 gssspi_set_cred_option

diff --git a/util_mech.c b/util_mech.c
index d28f399..131ac0b 100644 (file)
--- a/util_mech.c
+++ b/util_mech.c
@@ -271,8 +271,8 @@ internalizeOid(const gss_OID oid,
     }
 
     if (*pInternalizedOid == GSS_C_NO_OID) {
-        if (oidEqual(oid, GSS_EAP_NT_PRINCIPAL_NAME))
-            *pInternalizedOid = (const gss_OID)GSS_EAP_NT_PRINCIPAL_NAME;
+        if (oidEqual(oid, GSS_EAP_NT_EAP_NAME))
+            *pInternalizedOid = (const gss_OID)GSS_EAP_NT_EAP_NAME;
     }
 
     if (*pInternalizedOid == GSS_C_NO_OID) {

diff --git a/util_name.c b/util_name.c
index c8c29c4..35739ec 100644 (file)
--- a/util_name.c
+++ b/util_name.c
@@ -59,12 +59,12 @@
 
 #include "gssapiP_eap.h"
 
-static gss_OID_desc gssEapNtPrincipalName = {
+static gss_OID_desc gssEapNtEapName = {
     /* 1.3.6.1.4.1.5322.22.2.1  */
     10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x02\x01"
 };
 
-gss_OID GSS_EAP_NT_PRINCIPAL_NAME = &gssEapNtPrincipalName;
+gss_OID GSS_EAP_NT_EAP_NAME = &gssEapNtEapName;
 
 OM_uint32
 gssEapAllocName(OM_uint32 *minor, gss_name_t *pName)
@@ -412,7 +412,7 @@ gssEapImportName(OM_uint32 *minor,
 {
     struct gss_eap_name_import_provider nameTypes[] = {
         { GSS_C_NT_USER_NAME,               importUserName              },
-        { GSS_EAP_NT_PRINCIPAL_NAME,        importUserName              },
+        { GSS_EAP_NT_EAP_NAME,              importUserName              },
         { GSS_C_NT_HOSTBASED_SERVICE,       importServiceName           },
         { GSS_C_NT_HOSTBASED_SERVICE_X,     importServiceName           },
         { GSS_C_NT_ANONYMOUS,               importAnonymousName         },
@@ -666,7 +666,7 @@ gssEapDisplayName(OM_uint32 *minor,
                                name->krbPrincipal, krbAnonymousPrincipal())) {
         name_type = GSS_C_NT_ANONYMOUS;
     } else {
-        name_type = GSS_EAP_NT_PRINCIPAL_NAME;
+        name_type = GSS_EAP_NT_EAP_NAME;
     }
 
     if (output_name_type != NULL)