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

(gss_display_status): handle krb5_get_err_text failing

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10532 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-08-23 04:34:41 +00:00
parent 217eaf4bea
commit fe6efabb74
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/gssapi/display_status.c
View File

@@ -129,21 +129,25 @@ OM_uint32 gss_display_status
asprintf (&buf, "%s %s", asprintf (&buf, "%s %s",
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) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
} else if (status_type == GSS_C_MECH_CODE) { } else if (status_type == GSS_C_MECH_CODE) {
buf = gssapi_krb5_get_error_string (); buf = gssapi_krb5_get_error_string ();
if (buf == NULL)
buf = strdup(krb5_get_err_text (gssapi_krb5_context, status_value));
if (buf == NULL) { if (buf == NULL) {
*minor_status = ENOMEM; const char *tmp = krb5_get_err_text (gssapi_krb5_context,
return GSS_S_FAILURE; status_value);
if (tmp == NULL)
asprintf(&buf, "unknown mech error-code %u",
(unsigned)status_value);
else
buf = strdup(tmp);
} }
} else } else
return GSS_S_BAD_STATUS; return GSS_S_BAD_STATUS;
if (buf == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
*message_context = 0; *message_context = 0;
status_string->length = strlen(buf); status_string->length = strlen(buf);

20
lib/gssapi/krb5/display_status.c
View File

@@ -129,21 +129,25 @@ OM_uint32 gss_display_status
asprintf (&buf, "%s %s", asprintf (&buf, "%s %s",
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) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
} else if (status_type == GSS_C_MECH_CODE) { } else if (status_type == GSS_C_MECH_CODE) {
buf = gssapi_krb5_get_error_string (); buf = gssapi_krb5_get_error_string ();
if (buf == NULL)
buf = strdup(krb5_get_err_text (gssapi_krb5_context, status_value));
if (buf == NULL) { if (buf == NULL) {
*minor_status = ENOMEM; const char *tmp = krb5_get_err_text (gssapi_krb5_context,
return GSS_S_FAILURE; status_value);
if (tmp == NULL)
asprintf(&buf, "unknown mech error-code %u",
(unsigned)status_value);
else
buf = strdup(tmp);
} }
} else } else
return GSS_S_BAD_STATUS; return GSS_S_BAD_STATUS;
if (buf == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
*message_context = 0; *message_context = 0;
status_string->length = strlen(buf); status_string->length = strlen(buf);