refactor unknown attribute syntax detection

[mech_eap.orig] / display_status.c

diff --git a/display_status.c b/display_status.c
index d285113..b3cf2f9 100644 (file)
--- a/display_status.c
+++ b/display_status.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.
  */
 
+/*
+ * Function for converting mechanism error codes to strings.
+ */
+
 #include "gssapiP_eap.h"
 
 static GSSEAP_THREAD_ONCE gssEapStatusInfoKeyOnce = GSSEAP_ONCE_INITIALIZER;
@@ -95,7 +99,7 @@ saveStatusInfoNoCopy(OM_uint32 minor, char *message)
     p->code = minor;
     p->message = message;
 
-    if (p != NULL)
+    if (next != NULL)
         *next = p;
     else
         GSSEAP_SETSPECIFIC(gssEapStatusInfoKey, p);
@@ -121,16 +125,17 @@ getStatusInfo(OM_uint32 minor)
 void
 gssEapSaveStatusInfo(OM_uint32 minor, const char *format, ...)
 {
-    char *s;
+    char *s = NULL;
     int n;
     va_list ap;
 
-    va_start(ap, format);
-    n = vasprintf(&s, format, ap);
-    va_end(ap);
+    if (format != NULL) {
+        va_start(ap, format);
+        n = vasprintf(&s, format, ap);
+        va_end(ap);
+    }
 
-    if (n >= 0)
-        saveStatusInfoNoCopy(minor, s);
+    saveStatusInfoNoCopy(minor, s);
 }
 
 OM_uint32
@@ -141,7 +146,7 @@ gss_display_status(OM_uint32 *minor,
                    OM_uint32 *message_context,
                    gss_buffer_t status_string)
 {
-    OM_uint32 major = GSS_S_COMPLETE;
+    OM_uint32 major;
     krb5_context krbContext = NULL;
     const char *errMsg;
 
@@ -149,11 +154,14 @@ gss_display_status(OM_uint32 *minor,
     status_string->value = NULL;
 
     if (!gssEapIsMechanismOid(mech_type)) {
+        *minor = GSSEAP_WRONG_MECH;
         return GSS_S_BAD_MECH;
     }
 
-    if (status_type != GSS_C_MECH_CODE) {
+    if (status_type != GSS_C_MECH_CODE ||
+        *message_context != 0) {
         /* we rely on the mechglue for GSS_C_GSS_CODE */
+        *minor = 0;
         return GSS_S_BAD_STATUS;
     }
 
@@ -165,8 +173,12 @@ gss_display_status(OM_uint32 *minor,
         errMsg = krb5_get_error_message(krbContext, status_value);
     }
 
-    if (errMsg != NULL)
+    if (errMsg != NULL) {
         major = makeStringBuffer(minor, errMsg, status_string);
+    } else {
+        major = GSS_S_COMPLETE;
+        *minor = 0;
+    }
 
     if (krbContext != NULL)
         krb5_free_error_message(krbContext, errMsg);