initial TLV refactor

[mech_eap.orig] / compare_name.c

diff --git a/compare_name.c b/compare_name.c
index 65aaa07..9621908 100644 (file)
--- a/compare_name.c
+++ b/compare_name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Compare two names.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32
@@ -38,19 +42,20 @@ gss_compare_name(OM_uint32 *minor,
                  gss_name_t name2,
                  int *name_equal)
 {
-    OM_uint32 major;
     krb5_context krbContext;
 
-    GSSEAP_KRB_INIT(&krbContext);
+    *minor = 0;
 
-    if (name1 == GSS_C_NO_NAME || name2 == GSS_C_NO_NAME) {
-        *minor = EINVAL;
-        return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_BAD_NAME;
-    }
+    if (name1 == GSS_C_NO_NAME && name2 == GSS_C_NO_NAME) {
+        *name_equal = 1;
+    } else if (name1 != GSS_C_NO_NAME && name2 != GSS_C_NO_NAME) {
+        GSSEAP_KRB_INIT(&krbContext);
 
-    *name_equal = krb5_principal_compare(krbContext,
-                                        name1->krbPrincipal, 
-                                        name2->krbPrincipal);
+        /* krbPrincipal is immutable, so lock not required */
+        *name_equal = krb5_principal_compare(krbContext,
+                                             name1->krbPrincipal,
+                                             name2->krbPrincipal);
+    }
 
-    return major;
+    return GSS_S_COMPLETE;
 }