remove util_alloc.c

[mech_eap.orig] / util_name.c

diff --git a/util_name.c b/util_name.c
index c41d9f7..1845692 100644 (file)
--- a/util_name.c
+++ b/util_name.c
@@ -56,8 +56,8 @@
 #include "gssapiP_eap.h"
 
 static gss_OID_desc gssEapNtPrincipalName = {
-    /* 1.3.6.1.4.1.5322.21.2.1  */
-    10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x02\x01"
+    /* 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;
@@ -384,7 +384,6 @@ gssEapExportNameInternal(OM_uint32 *minor,
     exportedName->value = NULL;
 
     GSSEAP_KRB_INIT(&krbContext);
-    GSSEAP_MUTEX_LOCK(&name->mutex);
 
     *minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
     if (*minor != 0) {
@@ -450,7 +449,6 @@ gssEapExportNameInternal(OM_uint32 *minor,
     major = GSS_S_COMPLETE;
 
 cleanup:
-    GSSEAP_MUTEX_UNLOCK(&name->mutex);
     gss_release_buffer(&tmpMinor, &attrs);
     if (GSS_ERROR(major))
         gss_release_buffer(&tmpMinor, exportedName);
@@ -480,9 +478,6 @@ gssEapDuplicateName(OM_uint32 *minor,
         return major;
     }
 
-    /* Lock mutex for copying mutable attributes */
-    GSSEAP_MUTEX_LOCK(&input_name->mutex);
-
     *minor = krb5_copy_principal(krbContext, input_name->krbPrincipal,
                                  &name->krbPrincipal);
     if (*minor != 0) {
@@ -499,8 +494,6 @@ gssEapDuplicateName(OM_uint32 *minor,
     *dest_name = name;
 
 cleanup:
-    GSSEAP_MUTEX_UNLOCK(&input_name->mutex);
-
     if (GSS_ERROR(major)) {
         gssEapReleaseName(&tmpMinor, &name);
     }