Name parse fixes

[mech_eap.orig] / get_name_attribute.c

diff --git a/get_name_attribute.c b/get_name_attribute.c
index f2ea472..8273368 100644 (file)
--- a/get_name_attribute.c
+++ b/get_name_attribute.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
@@ -32,6 +32,10 @@
 
 #include "gssapiP_eap.h"
 
+/*
+ * Wrapper for retrieving a naming attribute.
+ */
+
 OM_uint32
 gss_get_name_attribute(OM_uint32 *minor,
                        gss_name_t name,
@@ -42,7 +46,9 @@ gss_get_name_attribute(OM_uint32 *minor,
                        gss_buffer_t display_value,
                        int *more)
 {
-    OM_uint32 major, tmpMinor;
+    OM_uint32 major;
+
+    *minor = 0;
 
     if (name == GSS_C_NO_NAME) {
         *minor = EINVAL;
@@ -51,7 +57,10 @@ gss_get_name_attribute(OM_uint32 *minor,
 
     GSSEAP_MUTEX_LOCK(&name->mutex);
 
-cleanup:
+    major = gssEapGetNameAttribute(minor, name, attr,
+                                   authenticated, complete,
+                                   value, display_value, more);
+
     GSSEAP_MUTEX_UNLOCK(&name->mutex);
 
     return major;