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

Move error functions from krb5 to base

Browse Source
This commit is contained in:
Nicolas Williams
2020-04-23 14:30:42 -05:00
parent e2d435cf2f
commit e8441212d1
13 changed files with 350 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

264
lib/base/error_string.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2003, 2005 - 2006 Kungliga Tekniska Högskolan
* Copyright (c) 2001, 2003, 2005 - 2020 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -31,190 +31,99 @@
* SUCH DAMAGE.
*/
#include "krb5_locl.h"
#include "baselocl.h"
#undef __attribute__
#define __attribute__(x)
/**
* Clears the error message from the Kerberos 5 context.
*
* @param context The Kerberos 5 context to clear
*
* @ingroup krb5_error
*/
KRB5_LIB_FUNCTION void KRB5_LIB_CALL
krb5_clear_error_message(krb5_context context)
void
heim_clear_error_message(heim_context context)
{
HEIMDAL_MUTEX_lock(&context->mutex);
if (context->error_string)
free(context->error_string);
free(context->error_string);
context->error_code = 0;
context->error_string = NULL;
HEIMDAL_MUTEX_unlock(&context->mutex);
}
/**
* Set the context full error string for a specific error code.
* The error that is stored should be internationalized.
*
* The if context is NULL, no error string is stored.
*
* @param context Kerberos 5 context
* @param ret The error code
* @param fmt Error string for the error code
* @param ... printf(3) style parameters.
*
* @ingroup krb5_error
*/
KRB5_LIB_FUNCTION void KRB5_LIB_CALL
krb5_set_error_message(krb5_context context, krb5_error_code ret,
const char *fmt, ...)
void
heim_set_error_message(heim_context context, heim_error_code ret,
const char *fmt, ...)
__attribute__ ((__format__ (__printf__, 3, 4)))
{
va_list ap;
va_start(ap, fmt);
krb5_vset_error_message (context, ret, fmt, ap);
heim_vset_error_message(context, ret, fmt, ap);
va_end(ap);
}
/**
* Set the context full error string for a specific error code.
*
* The if context is NULL, no error string is stored.
*
* @param context Kerberos 5 context
* @param ret The error code
* @param fmt Error string for the error code
* @param args printf(3) style parameters.
*
* @ingroup krb5_error
*/
KRB5_LIB_FUNCTION void KRB5_LIB_CALL
krb5_vset_error_message (krb5_context context, krb5_error_code ret,
const char *fmt, va_list args)
void
heim_vset_error_message(heim_context context, heim_error_code ret,
const char *fmt, va_list args)
__attribute__ ((__format__ (__printf__, 3, 0)))
{
int r;
if (context == NULL)
return;
HEIMDAL_MUTEX_lock(&context->mutex);
return;
if (context->error_string) {
free(context->error_string);
context->error_string = NULL;
free(context->error_string);
context->error_string = NULL;
}
context->error_code = ret;
r = vasprintf(&context->error_string, fmt, args);
if (r < 0)
context->error_string = NULL;
HEIMDAL_MUTEX_unlock(&context->mutex);
context->error_string = NULL;
if (context->error_string)
_krb5_debug(context, 100, "error message: %s: %d", context->error_string, ret);
heim_debug(context, 200, "error message: %s: %d", context->error_string, ret);
}
/**
* Prepend the context full error string for a specific error code.
* The error that is stored should be internationalized.
*
* The if context is NULL, no error string is stored.
*
* @param context Kerberos 5 context
* @param ret The error code
* @param fmt Error string for the error code
* @param ... printf(3) style parameters.
*
* @ingroup krb5_error
*/
KRB5_LIB_FUNCTION void KRB5_LIB_CALL
krb5_prepend_error_message(krb5_context context, krb5_error_code ret,
const char *fmt, ...)
void
heim_prepend_error_message(heim_context context, heim_error_code ret,
const char *fmt, ...)
__attribute__ ((__format__ (__printf__, 3, 4)))
{
va_list ap;
va_start(ap, fmt);
krb5_vprepend_error_message(context, ret, fmt, ap);
heim_vprepend_error_message(context, ret, fmt, ap);
va_end(ap);
}
/**
* Prepend the contexts's full error string for a specific error code.
*
* The if context is NULL, no error string is stored.
*
* @param context Kerberos 5 context
* @param ret The error code
* @param fmt Error string for the error code
* @param args printf(3) style parameters.
*
* @ingroup krb5_error
*/
KRB5_LIB_FUNCTION void KRB5_LIB_CALL
krb5_vprepend_error_message(krb5_context context, krb5_error_code ret,
const char *fmt, va_list args)
void
heim_vprepend_error_message(heim_context context, heim_error_code ret,
const char *fmt, va_list args)
__attribute__ ((__format__ (__printf__, 3, 0)))
{
char *str = NULL, *str2 = NULL;
if (context == NULL)
return;
HEIMDAL_MUTEX_lock(&context->mutex);
if (context->error_code != ret) {
HEIMDAL_MUTEX_unlock(&context->mutex);
return;
}
if (vasprintf(&str, fmt, args) < 0 || str == NULL) {
HEIMDAL_MUTEX_unlock(&context->mutex);
return;
}
if (context == NULL || context->error_code != ret ||
vasprintf(&str, fmt, args) < 0 || str == NULL)
return;
if (context->error_string) {
int e;
int e;
e = asprintf(&str2, "%s: %s", str, context->error_string);
free(context->error_string);
if (e < 0 || str2 == NULL)
context->error_string = NULL;
else
context->error_string = str2;
free(str);
e = asprintf(&str2, "%s: %s", str, context->error_string);
free(context->error_string);
if (e < 0 || str2 == NULL)
context->error_string = NULL;
else
context->error_string = str2;
free(str);
} else
context->error_string = str;
HEIMDAL_MUTEX_unlock(&context->mutex);
context->error_string = str;
}
/**
* Return the error message for `code' in context. On memory
* allocation error the function returns NULL.
*
* @param context Kerberos 5 context
* @param code Error code related to the error
*
* @return an error string, needs to be freed with
* krb5_free_error_message(). The functions return NULL on error.
*
* @ingroup krb5_error
*/
KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
krb5_get_error_message(krb5_context context, krb5_error_code code)
const char *
heim_get_error_message(heim_context context, heim_error_code code)
{
char *str = NULL;
const char *cstr = NULL;
char *str = NULL;
char buf[128];
int free_context = 0;
if (code == 0)
return strdup("Success");
return strdup("Success");
/*
* The MIT version of this function ignores the krb5_context
@@ -224,87 +133,42 @@ krb5_get_error_message(krb5_context context, krb5_error_code code)
* might be provided is if the krb5_init_context() call itself
* failed.
*/
if (context)
{
HEIMDAL_MUTEX_lock(&context->mutex);
if (context->error_string &&
(code == context->error_code || context->error_code == 0))
{
str = strdup(context->error_string);
}
HEIMDAL_MUTEX_unlock(&context->mutex);
if (str)
return str;
}
else
{
if (krb5_init_context(&context) == 0)
free_context = 1;
}
if (context &&
context->error_string &&
(code == context->error_code || context->error_code == 0) &&
(cstr = strdup(context->error_string)))
return cstr;
if (context == NULL && (context = heim_context_init()))
free_context = 1;
if (context)
cstr = com_right_r(context->et_list, code, buf, sizeof(buf));
if (free_context)
krb5_free_context(context);
heim_context_free(&context);
if (cstr)
if (cstr || (cstr = error_message(code)))
return strdup(cstr);
cstr = error_message(code);
if (cstr)
return strdup(cstr);
if (asprintf(&str, "<unknown error: %d>", (int)code) == -1 || str == NULL)
return NULL;
return NULL;
return str;
}
const char *
heim_get_error_string(heim_context context)
{
if (context && context->error_string)
return strdup(context->error_string);
return NULL;
}
/**
* Free the error message returned by krb5_get_error_message().
*
* @param context Kerberos context
* @param msg error message to free, returned byg
* krb5_get_error_message().
*
* @ingroup krb5_error
*/
int
heim_have_error_string(heim_context context)
{
return context->error_string != NULL;
}
KRB5_LIB_FUNCTION void KRB5_LIB_CALL
krb5_free_error_message(krb5_context context, const char *msg)
void
heim_free_error_message(heim_context context, const char *msg)
{
free(rk_UNCONST(msg));
}
/**
* Return the error string for the error code. The caller must not
* free the string.
*
* This function is deprecated since its not threadsafe.
*
* @param context Kerberos 5 context.
* @param code Kerberos error code.
*
* @return the error message matching code
*
* @ingroup krb5
*/
KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
krb5_get_err_text(krb5_context context, krb5_error_code code)
KRB5_DEPRECATED_FUNCTION("Use krb5_get_error_message instead")
{
const char *p = NULL;
if(context != NULL)
p = com_right(context->et_list, code);
if(p == NULL)
p = strerror(code);
if (p == NULL)
p = "Unknown error";
return p;
}