--- /net/etna.eng/build7/semery/mit2/webrev/usr/src/lib/libgss/g_compare_name.c-        Wed Sep  8 17:00:16 2004
+++ g_compare_name.c    Wed Sep  8 13:42:01 2004
@@ -1,11 +1,11 @@
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident  "@(#)g_compare_name.c   1.17    04/09/08 SMI"
+#pragma ident  "@(#)g_compare_name.c   1.16    04/02/23 SMI"
 
 /*
  *  glue routine for gss_compare_name
  *
  */
@@ -31,18 +31,20 @@
        OM_uint32               major_status, temp_minor;
        gss_union_name_t        union_name1, union_name2;
        gss_mechanism           mech;
        gss_name_t              internal_name;
 
-       gss_initialize();
+       if (minor_status == NULL)
+               return (GSS_S_CALL_INACCESSIBLE_WRITE);
+       *minor_status = 0;
 
-       if (name1 == 0 || name2 == 0) {
-               if (name_equal)
-                       *name_equal = 0;
-               return (GSS_S_BAD_NAME);
-       }
+       if (name1 == 0 || name2 == 0)
+               return (GSS_S_CALL_INACCESSIBLE_READ | GSS_S_BAD_NAME);
 
+       if (name_equal == NULL)
+               return (GSS_S_CALL_INACCESSIBLE_WRITE);
+
        union_name1 = (gss_union_name_t)name1;
        union_name2 = (gss_union_name_t)name2;
        /*
         * Try our hardest to make union_name1 be the mechanism-specific
         * name.  (Of course we can't if both names aren't
@@ -59,16 +61,13 @@
        if (union_name1->mech_type) {
                mech = __gss_get_mechanism(union_name1->mech_type);
                if (!mech)
                        return (GSS_S_BAD_MECH);
                if (!mech->gss_compare_name)
-                       return (GSS_S_BAD_BINDINGS);
+                       return (GSS_S_UNAVAILABLE);
        }
 
-       if (name_equal == NULL)
-               return GSS_S_COMPLETE;
-
        *name_equal = 0;        /* Default to *not* equal.... */
 
        /*
         * First case... both names are mechanism-specific
         */
@@ -95,12 +94,36 @@
         * internal name. We cannot determine this, since we as yet do not
         * know what mechanism to use for calling the underlying
         * gss_import_name().
         */
        if (!union_name1->mech_type && !union_name2->mech_type) {
-               if (!g_OID_equal(union_name1->name_type, union_name2->name_type))
+               /*
+                * Second case, first sub-case... one name has null
+                * name_type, the other doesn't.
+                *
+                * Not knowing a mech_type we can't import the name with
+                * null name_type so we can't compare.
+                */
+               if ((union_name1->name_type == GSS_C_NULL_OID &&
+                   union_name2->name_type != GSS_C_NULL_OID) ||
+                   (union_name1->name_type != GSS_C_NULL_OID &&
+                   union_name2->name_type == GSS_C_NULL_OID))
                        return (GSS_S_COMPLETE);
+               /*
+                * Second case, second sub-case... both names have
+                * name_types, but they are different.
+                */
+               if ((union_name1->name_type != GSS_C_NULL_OID &&
+                   union_name2->name_type != GSS_C_NULL_OID) &&
+                   !g_OID_equal(union_name1->name_type,
+                                       union_name2->name_type))
+                       return (GSS_S_COMPLETE);
+               /*
+                * Second case, third sub-case... both names have equal
+                * name_types (and both have no mech_types) so we just
+                * compare the external_names.
+                */
                if ((union_name1->external_name->length !=
                        union_name2->external_name->length) ||
                        (memcmp(union_name1->external_name->value,
                                union_name2->external_name->value,
                                union_name1->external_name->length) != 0))
@@ -125,11 +148,11 @@
        major_status = __gss_import_internal_name(minor_status,
                                                        union_name1->mech_type,
                                                        union_name2,
                                                        &internal_name);
        if (major_status != GSS_S_COMPLETE)
-               return (GSS_S_COMPLETE);
+               return (GSS_S_COMPLETE); /* return complete, but not equal */
 
        major_status = mech->gss_compare_name(mech->context, minor_status,
                                                        union_name1->mech_name,
                                                        internal_name,
                                                        name_equal);