Move some infra bits of lib/krb5/ to lib/base/ (1)
This is the first of two commits in a series that must be picked together. This series of two commits moves parts of lib/krb5/ infrastructure functionality to lib/base/, leaving behind wrappers. This commit only renames files to enable git log/diff/blame to follow the renames: to help future code archeology, and to make reviewing these two commits easier. The next commit in this series ensures that the moved files have the correct content (i.e., defining heim APIs instead of krb5 APIs), and will create files in lib/krb5 with the same names and krb5 API wrappers around the new heim API functions. The next commit also explains the motivation, which, briefly, is to: - remove krb5 API usage from lib/gssapi/, - enable the use of configuration and plugins in lib/hx509/ (as well as lib/gssapi/ and future projects), and - enable the further disentanglement of bx509d from kdc/.
This commit is contained in:
Nicolas Williams
359
lib/base/warn.c
Normal file
359
lib/base/warn.c
Normal file
@@ -0,0 +1,359 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(disable: 4646)
|
||||
# pragma warning(disable: 4716)
|
||||
#endif
|
||||
|
||||
#include "krb5_locl.h"
|
||||
#include <err.h>
|
||||
|
||||
static krb5_error_code _warnerr(krb5_context context, int do_errtext,
|
||||
krb5_error_code code, int level, const char *fmt, va_list ap)
|
||||
__attribute__ ((__format__ (__printf__, 5, 0)));
|
||||
|
||||
static krb5_error_code
|
||||
_warnerr(krb5_context context, int do_errtext,
|
||||
krb5_error_code code, int level, const char *fmt, va_list ap)
|
||||
{
|
||||
char xfmt[7] = "";
|
||||
const char *args[2], **arg;
|
||||
char *msg = NULL;
|
||||
const char *err_str = NULL;
|
||||
krb5_error_code ret;
|
||||
|
||||
args[0] = args[1] = NULL;
|
||||
arg = args;
|
||||
if(fmt){
|
||||
strlcat(xfmt, "%s", sizeof(xfmt));
|
||||
if(do_errtext)
|
||||
strlcat(xfmt, ": ", sizeof(xfmt));
|
||||
ret = vasprintf(&msg, fmt, ap);
|
||||
if(ret < 0 || msg == NULL)
|
||||
return ENOMEM;
|
||||
*arg++ = msg;
|
||||
}
|
||||
if(context && do_errtext){
|
||||
strlcat(xfmt, "%s", sizeof(xfmt));
|
||||
|
||||
err_str = krb5_get_error_message(context, code);
|
||||
if (err_str != NULL) {
|
||||
*arg = err_str;
|
||||
} else {
|
||||
*arg= "<unknown error>";
|
||||
}
|
||||
}
|
||||
|
||||
if(context && context->warn_dest)
|
||||
krb5_log(context, context->warn_dest, level, xfmt, args[0], args[1]);
|
||||
else
|
||||
warnx(xfmt, args[0], args[1]);
|
||||
free(msg);
|
||||
krb5_free_error_message(context, err_str);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define FUNC(ETEXT, CODE, LEVEL) \
|
||||
krb5_error_code ret; \
|
||||
va_list ap; \
|
||||
va_start(ap, fmt); \
|
||||
ret = _warnerr(context, ETEXT, CODE, LEVEL, fmt, ap); \
|
||||
va_end(ap);
|
||||
|
||||
#define FUNC_NORET(ETEXT, CODE, LEVEL) \
|
||||
va_list ap; \
|
||||
va_start(ap, fmt); \
|
||||
(void) _warnerr(context, ETEXT, CODE, LEVEL, fmt, ap); \
|
||||
va_end(ap);
|
||||
|
||||
#undef __attribute__
|
||||
#define __attribute__(X)
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr, include the error from
|
||||
* the last failure.
|
||||
*
|
||||
* @param context A Kerberos 5 context.
|
||||
* @param code error code of the last error
|
||||
* @param fmt message to print
|
||||
* @param ap arguments
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_vwarn(krb5_context context, krb5_error_code code,
|
||||
const char *fmt, va_list ap)
|
||||
__attribute__ ((__format__ (__printf__, 3, 0)))
|
||||
{
|
||||
return _warnerr(context, 1, code, 1, fmt, ap);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr, include the error from
|
||||
* the last failure.
|
||||
*
|
||||
* @param context A Kerberos 5 context.
|
||||
* @param code error code of the last error
|
||||
* @param fmt message to print
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_warn(krb5_context context, krb5_error_code code, const char *fmt, ...)
|
||||
__attribute__ ((__format__ (__printf__, 3, 4)))
|
||||
{
|
||||
FUNC(1, code, 1);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr.
|
||||
*
|
||||
* @param context A Kerberos 5 context.
|
||||
* @param fmt message to print
|
||||
* @param ap arguments
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_vwarnx(krb5_context context, const char *fmt, va_list ap)
|
||||
__attribute__ ((__format__ (__printf__, 2, 0)))
|
||||
{
|
||||
return _warnerr(context, 0, 0, 1, fmt, ap);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr.
|
||||
*
|
||||
* @param context A Kerberos 5 context.
|
||||
* @param fmt message to print
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_warnx(krb5_context context, const char *fmt, ...)
|
||||
__attribute__ ((__format__ (__printf__, 2, 3)))
|
||||
{
|
||||
FUNC(0, 0, 1);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr, include bthe error from
|
||||
* the last failure and then exit.
|
||||
*
|
||||
* @param context A Kerberos 5 context
|
||||
* @param eval the exit code to exit with
|
||||
* @param code error code of the last error
|
||||
* @param fmt message to print
|
||||
* @param ap arguments
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_NORETURN_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_verr(krb5_context context, int eval, krb5_error_code code,
|
||||
const char *fmt, va_list ap)
|
||||
__attribute__ ((__noreturn__, __format__ (__printf__, 4, 0)))
|
||||
{
|
||||
_warnerr(context, 1, code, 0, fmt, ap);
|
||||
exit(eval);
|
||||
UNREACHABLE(return 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr, include bthe error from
|
||||
* the last failure and then exit.
|
||||
*
|
||||
* @param context A Kerberos 5 context
|
||||
* @param eval the exit code to exit with
|
||||
* @param code error code of the last error
|
||||
* @param fmt message to print
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_NORETURN_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_err(krb5_context context, int eval, krb5_error_code code,
|
||||
const char *fmt, ...)
|
||||
__attribute__ ((__noreturn__, __format__ (__printf__, 4, 5)))
|
||||
{
|
||||
FUNC_NORET(1, code, 0);
|
||||
exit(eval);
|
||||
UNREACHABLE(return 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr, and then exit.
|
||||
*
|
||||
* @param context A Kerberos 5 context
|
||||
* @param eval the exit code to exit with
|
||||
* @param fmt message to print
|
||||
* @param ap arguments
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_NORETURN_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_verrx(krb5_context context, int eval, const char *fmt, va_list ap)
|
||||
__attribute__ ((__noreturn__, __format__ (__printf__, 3, 0)))
|
||||
{
|
||||
_warnerr(context, 0, 0, 0, fmt, ap);
|
||||
exit(eval);
|
||||
UNREACHABLE(return 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr, and then exit.
|
||||
*
|
||||
* @param context A Kerberos 5 context
|
||||
* @param eval the exit code to exit with
|
||||
* @param fmt message to print
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_NORETURN_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_errx(krb5_context context, int eval, const char *fmt, ...)
|
||||
__attribute__ ((__noreturn__, __format__ (__printf__, 3, 4)))
|
||||
{
|
||||
FUNC_NORET(0, 0, 0);
|
||||
exit(eval);
|
||||
UNREACHABLE(return 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr, include bthe error from
|
||||
* the last failure and then abort.
|
||||
*
|
||||
* @param context A Kerberos 5 context
|
||||
* @param code error code of the last error
|
||||
* @param fmt message to print
|
||||
* @param ap arguments
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_NORETURN_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_vabort(krb5_context context, krb5_error_code code,
|
||||
const char *fmt, va_list ap)
|
||||
__attribute__ ((__noreturn__, __format__ (__printf__, 3, 0)))
|
||||
{
|
||||
_warnerr(context, 1, code, 0, fmt, ap);
|
||||
abort();
|
||||
UNREACHABLE(return 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr, include the error from
|
||||
* the last failure and then abort.
|
||||
*
|
||||
* @param context A Kerberos 5 context
|
||||
* @param code error code of the last error
|
||||
* @param fmt message to print
|
||||
* @param ... arguments for format string
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_NORETURN_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_abort(krb5_context context, krb5_error_code code, const char *fmt, ...)
|
||||
__attribute__ ((__noreturn__, __format__ (__printf__, 3, 4)))
|
||||
{
|
||||
FUNC_NORET(1, code, 0);
|
||||
abort();
|
||||
UNREACHABLE(return 0);
|
||||
}
|
||||
|
||||
KRB5_LIB_NORETURN_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_vabortx(krb5_context context, const char *fmt, va_list ap)
|
||||
__attribute__ ((__noreturn__, __format__ (__printf__, 2, 0)))
|
||||
{
|
||||
_warnerr(context, 0, 0, 0, fmt, ap);
|
||||
abort();
|
||||
UNREACHABLE(return 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a warning to the log, default stderr, and then abort.
|
||||
*
|
||||
* @param context A Kerberos 5 context
|
||||
* @param fmt printf format string of message to print
|
||||
* @param ... arguments for format string
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_NORETURN_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_abortx(krb5_context context, const char *fmt, ...)
|
||||
__attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)))
|
||||
{
|
||||
FUNC_NORET(0, 0, 0);
|
||||
abort();
|
||||
UNREACHABLE(return 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the default logging facility.
|
||||
*
|
||||
* @param context A Kerberos 5 context
|
||||
* @param fac Facility to use for logging.
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
|
||||
krb5_set_warn_dest(krb5_context context, krb5_log_facility *fac)
|
||||
{
|
||||
context->warn_dest = fac;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the default logging facility.
|
||||
*
|
||||
* @param context A Kerberos 5 context
|
||||
*
|
||||
* @ingroup krb5_error
|
||||
*/
|
||||
|
||||
KRB5_LIB_FUNCTION krb5_log_facility * KRB5_LIB_CALL
|
||||
krb5_get_warn_dest(krb5_context context)
|
||||
{
|
||||
return context->warn_dest;
|
||||
}
|
||||
Reference in New Issue
Block a user