oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(gss_display_status): use _gss_mg_get_error to fetch the error from

Browse Source 
underlaying mech, if it failes, let do the regular dance for GSS-CODE
version and a generic print-the-error code for MECH-CODE.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19927 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-01-16 10:35:09 +00:00
parent 5138355930
commit 0a7d314165
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/gssapi/mech/gss_display_status.c
View File

@@ -148,6 +148,14 @@ gss_display_status(OM_uint32 *minor_status,
{ {
OM_uint32 major_status; OM_uint32 major_status;
major_status = _gss_mg_get_error(mech_type, status_type,
status_value, status_string);
if (major_status == GSS_S_COMPLETE) {
*message_content = 0;
*minor_status = 0;
return GSS_S_COMPLETE;
}
*minor_status = 0; *minor_status = 0;
switch (status_type) { switch (status_type) {
case GSS_C_GSS_CODE: { case GSS_C_GSS_CODE: {
@@ -161,21 +169,38 @@ gss_display_status(OM_uint32 *minor_status,
calling_error(GSS_CALLING_ERROR(status_value)), calling_error(GSS_CALLING_ERROR(status_value)),
routine_error(GSS_ROUTINE_ERROR(status_value))); routine_error(GSS_ROUTINE_ERROR(status_value)));
if (buf == NULL)
break;
status_string->length = strlen(buf); status_string->length = strlen(buf);
status_string->value = buf; status_string->value = buf;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }
case GSS_C_MECH_CODE: { case GSS_C_MECH_CODE: {
gssapi_mech_interface m; OM_uint32 maj_junk, min_junk;
m = __gss_get_mechanism(mech_type); gss_buffer_desc oid;
if (m) { char *buf;
major_status = m->gm_display_status(minor_status,
status_value, status_type, mech_type, maj_junk = gss_oid_to_str(&min_junk, mech_type, &oid);
message_content, status_string); if (maj_junk != GSS_S_COMPLETE) {
if (major_status == GSS_S_COMPLETE) oid.value = rk_UNCONST("unknown");
return (GSS_S_COMPLETE); oid.length = 7;
} }
asprintf (&buf, "unknown mech-code %d for mech %.*s",
(unsigned long)status_value,
(int)oid.length, (char *)oid.value);
if (maj_junk == GSS_S_COMPLETE)
gss_release_buffer(&min_junk, &oid);
if (buf == NULL)
break;
status_string->length = strlen(buf);
status_string->value = buf;
return GSS_S_COMPLETE;
} }
} }
status_string->value = NULL; status_string->value = NULL;