s/GSS_EAP_NT_PRINCIPAL_NAME/GSS_EAP_NT_EAP_NAME

[mech_eap.orig] / util_cred.c

diff --git a/util_cred.c b/util_cred.c
index 64b9284..0a2108b 100644 (file)
--- a/util_cred.c
+++ b/util_cred.c
@@ -161,6 +161,7 @@ gssEapAcquireCred(OM_uint32 *minor,
     } else {
         gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
         gss_OID nameType = GSS_C_NO_OID;
+        char loginName[256];
 
         if (cred->flags & CRED_FLAG_ACCEPT) {
             char serviceName[5 + MAXHOSTNAMELEN] = "host@";
@@ -177,14 +178,22 @@ gssEapAcquireCred(OM_uint32 *minor,
 
             nameType = GSS_C_NT_HOSTBASED_SERVICE;
         } else if (cred->flags & CRED_FLAG_INITIATE) {
-            nameBuf.value = getlogin(); /* XXX */
-            nameBuf.length = strlen((char *)nameBuf.value);
+            /* XXX FIXME temporary implementation */
+            snprintf(loginName, sizeof(loginName), "%s@", getlogin());
+            nameBuf.value = loginName;
+            nameBuf.length = strlen(loginName);
 
             nameType = GSS_C_NT_USER_NAME;
         }
 
         if (nameBuf.length != 0) {
-            major = gssEapImportName(minor, &nameBuf, nameType, &cred->name);
+            gss_OID mech = GSS_C_NO_OID;
+
+            if (cred->mechanisms != GSS_C_NO_OID_SET &&
+                cred->mechanisms->count == 1)
+                mech = &cred->mechanisms->elements[0];
+
+            major = gssEapImportName(minor, &nameBuf, nameType, mech, &cred->name);
             if (GSS_ERROR(major))
                 goto cleanup;
         }
@@ -194,6 +203,7 @@ gssEapAcquireCred(OM_uint32 *minor,
 
 #ifdef GSSEAP_DEBUG
     if (password == GSS_C_NO_BUFFER &&
+        (cred->flags & CRED_FLAG_DEFAULT_IDENTITY) &&
         (envPassword.value = getenv("GSSEAP_CREDS")) != NULL) {
         envPassword.length = strlen((char *)envPassword.value);
         major = duplicateBuffer(minor, &envPassword, &cred->password);