static void
saveStatusInfoNoCopy(OM_uint32 minor, char *message)
{
- struct gss_eap_status_info *info, *p;
+ struct gss_eap_status_info **next = NULL, *p;
GSSEAP_ONCE(&gssEapStatusInfoKeyOnce, createStatusInfoKey);
- info = GSSEAP_CALLOC(1, sizeof(*info));
- if (info == NULL)
- return;
-
- info->code = minor;
- info->message = message;
-
p = GSSEAP_GETSPECIFIC(gssEapStatusInfoKey);
+ for (; p != NULL; p = p->next) {
+ if (p->code == minor) {
+ p->message = message;
+ return;
+ }
+ next = &p->next;
+ }
+
+ p = GSSEAP_CALLOC(1, sizeof(*p));
if (p == NULL) {
- GSSEAP_SETSPECIFIC(gssEapStatusInfoKey, info);
- } else {
- struct gss_eap_status_info **next = &p;
+ GSSEAP_FREE(message);
+ return;
+ }
- for (; p != NULL; p = p->next)
- next = &p->next;
+ p->code = minor;
+ p->message = message;
- *next = info;
- }
+ if (p != NULL)
+ *next = p;
+ else
+ GSSEAP_SETSPECIFIC(gssEapStatusInfoKey, p);
}
static const char *
saveStatusInfoNoCopy(minor, s);
}
-#if 0
-void
-gssEapSaveKrbStatusInfo(OM_uint32 minor)
-{
- krb5_context krbContext = NULL;
- OM_uint32 tmpMinor;
- const char *s;
-
- gssEapKerberosInit(&tmpMinor, &krbContext);
-
- if (krbContext != NULL) {
- s = krb5_get_error_message(krbContext, minor);
- gssEapSaveStatusInfo(minor, "%s", s);
- krb5_set_error_message(krbContext, minor, "%s", s);
- krb5_free_error_message(krbContext, s);
- }
-}
-#endif
-
OM_uint32
gss_display_status(OM_uint32 *minor,
OM_uint32 status_value,
gss_buffer_t status_string)
{
OM_uint32 major = GSS_S_COMPLETE;
- krb5_context krbContext;
+ krb5_context krbContext = NULL;
const char *errMsg;
status_string->length = 0;
return GSS_S_BAD_STATUS;
}
- GSSEAP_KRB_INIT(&krbContext);
+ errMsg = getStatusInfo(status_value);
+ if (errMsg == NULL) {
+ GSSEAP_KRB_INIT(&krbContext);
- errMsg = krb5_get_error_message(krbContext, status_value);
+ errMsg = krb5_get_error_message(krbContext, status_value);
+ }
- if (errMsg != NULL) {
+ if (errMsg != NULL)
major = makeStringBuffer(minor, errMsg, status_string);
- }
- krb5_free_error_message(krbContext, errMsg);
+ if (krbContext != NULL)
+ krb5_free_error_message(krbContext, errMsg);
return major;
}