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

Bug fixes, cleanup, compiler warnings, restructure code.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17700 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-06-28 09:00:26 +00:00
parent 534d628c29
commit d3f8f8e122
47 changed files with 308 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,10 +26,8 @@
* $FreeBSD: src/lib/libgssapi/gss_display_status.c,v 1.1 2005/12/29 14:40:20 dfr Exp $
*/
#include <gssapi/gssapi.h>
#include <string.h>
#include "mech_switch.h"
#include "mech_locl.h"
RCSID("$Id$");
struct _gss_status_desc {
OM_uint32 gs_status;
@@ -37,28 +35,28 @@ struct _gss_status_desc {
};
static struct _gss_status_desc _gss_status_descs[] = {
GSS_S_BAD_MECH, "An unsupported mechanism was requested",
GSS_S_BAD_NAME, "An invalid name was supplied",
GSS_S_BAD_NAMETYPE, "A supplied name was of an unsupported type",
GSS_S_BAD_BINDINGS, "Incorrect channel bindings were supplied",
GSS_S_BAD_STATUS, "An invalid status code was supplied",
GSS_S_BAD_MIC, "A token had an invalid MIC",
GSS_S_NO_CRED, "No credentials were supplied, or the "
"credentials were unavailable or inaccessible",
GSS_S_NO_CONTEXT, "No context has been established",
GSS_S_DEFECTIVE_TOKEN, "A token was invalid",
GSS_S_DEFECTIVE_CREDENTIAL, "A credential was invalid",
GSS_S_CREDENTIALS_EXPIRED, "The referenced credentials have expired",
GSS_S_CONTEXT_EXPIRED, "The context has expired",
GSS_S_FAILURE, "Miscellaneous failure",
GSS_S_BAD_QOP, "The quality-of-protection requested could "
"not be provided",
GSS_S_UNAUTHORIZED, "The operation is forbidden by local security "
"policy",
GSS_S_UNAVAILABLE, "The operation or option is unavailable",
GSS_S_DUPLICATE_ELEMENT, "The requested credential element already "
"exists",
GSS_S_NAME_NOT_MN, "The provided name was not a mechanism name"
{ GSS_S_BAD_MECH, "An unsupported mechanism was requested"},
{ GSS_S_BAD_NAME, "An invalid name was supplied"},
{ GSS_S_BAD_NAMETYPE, "A supplied name was of an unsupported type"},
{ GSS_S_BAD_BINDINGS, "Incorrect channel bindings were supplied"},
{ GSS_S_BAD_STATUS, "An invalid status code was supplied"},
{ GSS_S_BAD_MIC, "A token had an invalid MIC"},
{ GSS_S_NO_CRED, "No credentials were supplied, or the "
"credentials were unavailable or inaccessible"},
{ GSS_S_NO_CONTEXT, "No context has been established"},
{ GSS_S_DEFECTIVE_TOKEN,"A token was invalid"},
{ GSS_S_DEFECTIVE_CREDENTIAL, "A credential was invalid"},
{ GSS_S_CREDENTIALS_EXPIRED, "The referenced credentials have expired"},
{ GSS_S_CONTEXT_EXPIRED, "The context has expired"},
{ GSS_S_FAILURE, "Miscellaneous failure"},
{ GSS_S_BAD_QOP, "The quality-of-protection requested could "
"not be provided"},
{ GSS_S_UNAUTHORIZED, "The operation is forbidden by local security "
"policy"},
{ GSS_S_UNAVAILABLE, "The operation or option is unavailable"},
{ GSS_S_DUPLICATE_ELEMENT, "The requested credential element already "
"exists"},
{ GSS_S_NAME_NOT_MN, "The provided name was not a mechanism name"}
};
#define _gss_status_desc_count \
sizeof(_gss_status_descs) / sizeof(_gss_status_descs[0])
@@ -73,7 +71,6 @@ gss_display_status(OM_uint32 *minor_status,
gss_buffer_t status_string)
{
OM_uint32 major_status;
struct _gss_mech_switch *m;
int i;
const char *message;
@@ -93,11 +90,10 @@ gss_display_status(OM_uint32 *minor_status,
* Fall through to attempt to get some underlying
* implementation to describe the value.
*/
case GSS_C_MECH_CODE:
SLIST_FOREACH(m, &_gss_mechs, gm_link) {
if (mech_type &&
!_gss_oid_equal(&m->gm_mech_oid, mech_type))
continue;
case GSS_C_MECH_CODE: {
gssapi_mech_interface m;
m = __gss_get_mechanism(mech_type);
if (m) {
major_status = m->gm_display_status(minor_status,
status_value, status_type, mech_type,
message_content, status_string);
@@ -105,6 +101,7 @@ gss_display_status(OM_uint32 *minor_status,
return (GSS_S_COMPLETE);
}
}
}
return (GSS_S_BAD_STATUS);
}