gssEapCreateAttrContext should not mutate context fields directly

[mech_eap.orig] / util_name.c

diff --git a/util_name.c b/util_name.c
index d01646c..9bceb3b 100644 (file)
--- a/util_name.c
+++ b/util_name.c
@@ -53,6 +53,10 @@
  * or implied warranty.
  */
 
+/*
+ * Name utility routines.
+ */
+
 #include "gssapiP_eap.h"
 
 static gss_OID_desc gssEapNtPrincipalName = {
@@ -132,10 +136,10 @@ krbPrincipalToName(OM_uint32 *minor,
     name->krbPrincipal = *principal;
     *principal = NULL;
 
-    if (name->krbPrincipal->length == 1) {
-        name->flags |= NAME_FLAG_NAI;
-    } else {
+    if (name->krbPrincipal->length > 1) {
         name->flags |= NAME_FLAG_SERVICE;
+    } else {
+        name->flags |= NAME_FLAG_NAI;
     }
 
     *pName = name;
@@ -228,8 +232,8 @@ importUserName(OM_uint32 *minor,
 
 #define CHECK_REMAIN(n)     do {        \
         if (remain < (n)) {             \
-            *minor = GSSEAP_WRONG_SIZE; \
             major = GSS_S_BAD_NAME;     \
+            *minor = GSSEAP_TOK_TRUNC;  \
             goto cleanup;               \
         }                               \
     } while (0)
@@ -309,6 +313,7 @@ gssEapImportNameInternal(OM_uint32 *minor,
     }
 
     major = GSS_S_COMPLETE;
+    *minor = 0;
 
 cleanup:
     if (GSS_ERROR(major))
@@ -464,8 +469,8 @@ gssEapExportNameInternal(OM_uint32 *minor,
 
     assert(p == (unsigned char *)exportedName->value + exportedNameLen);
 
-    *minor = 0;
     major = GSS_S_COMPLETE;
+    *minor = 0;
 
 cleanup:
     gss_release_buffer(&tmpMinor, &attrs);
@@ -497,6 +502,8 @@ gssEapDuplicateName(OM_uint32 *minor,
         return major;
     }
 
+    name->flags = input_name->flags;
+
     *minor = krb5_copy_principal(krbContext, input_name->krbPrincipal,
                                  &name->krbPrincipal);
     if (*minor != 0) {