diff options
| author | Russ Allbery <eagle@eyrie.org> | 2020-05-17 17:05:30 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2020-05-17 17:05:30 -0700 |
| commit | c138111a3c27863308b6552a5527a9e821a3dc11 (patch) | |
| tree | fe3c16462bf0213708f20d251a63e5b9bbf2d23f /portable/krb5-extra.c | |
| parent | ccfbd34d597318215b979338c4cb5d7e4a3f0d6f (diff) | |
Update to rra-c-util 8.2 and C TAP Harness 4.7
Update to rra-c-util 8.2:
* Implement explicit_bzero with memset if it is not available.
* Reformat all C source using clang-format 10.
* Work around Test::Strict not skipping .git directories.
* Fix warnings with perltidy 20190601 and Perl::Critic 1.134.
* Fix warnings with Clang 10, GCC 10, and the Clang static analyzer.
Update to C TAP Harness 4.7:
* Fix warnings with GCC 10.
* Reformat all C source using clang-format 10.
* Fixed malloc error checking in bstrndup.
Diffstat (limited to 'portable/krb5-extra.c')
| -rw-r--r-- | portable/krb5-extra.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/portable/krb5-extra.c b/portable/krb5-extra.c index 9de8e65..3632f8b 100644 --- a/portable/krb5-extra.c +++ b/portable/krb5-extra.c @@ -31,17 +31,17 @@ /* Figure out what header files to include for error reporting. */ #if !defined(HAVE_KRB5_GET_ERROR_MESSAGE) && !defined(HAVE_KRB5_GET_ERR_TEXT) -# if !defined(HAVE_KRB5_GET_ERROR_STRING) -# if defined(HAVE_IBM_SVC_KRB5_SVC_H) -# include <ibm_svc/krb5_svc.h> -# elif defined(HAVE_ET_COM_ERR_H) -# include <et/com_err.h> -# elif defined(HAVE_KERBEROSV5_COM_ERR_H) -# include <kerberosv5/com_err.h> -# else -# include <com_err.h> -# endif -# endif +# if !defined(HAVE_KRB5_GET_ERROR_STRING) +# if defined(HAVE_IBM_SVC_KRB5_SVC_H) +# include <ibm_svc/krb5_svc.h> +# elif defined(HAVE_ET_COM_ERR_H) +# include <et/com_err.h> +# elif defined(HAVE_KERBEROSV5_COM_ERR_H) +# include <kerberosv5/com_err.h> +# else +# include <com_err.h> +# endif +# endif #endif /* Used for unused parameters to silence gcc warnings. */ @@ -69,15 +69,15 @@ krb5_get_error_message(krb5_context ctx UNUSED, krb5_error_code code UNUSED) { const char *msg; -# if defined(HAVE_KRB5_GET_ERROR_STRING) +# if defined(HAVE_KRB5_GET_ERROR_STRING) msg = krb5_get_error_string(ctx); -# elif defined(HAVE_KRB5_GET_ERR_TEXT) +# elif defined(HAVE_KRB5_GET_ERR_TEXT) msg = krb5_get_err_text(ctx, code); -# elif defined(HAVE_KRB5_SVC_GET_MSG) +# elif defined(HAVE_KRB5_SVC_GET_MSG) krb5_svc_get_msg(code, (char **) &msg); -# else +# else msg = error_message(code); -# endif +# endif if (msg == NULL) return error_unknown; else @@ -100,11 +100,11 @@ krb5_free_error_message(krb5_context ctx UNUSED, const char *msg) { if (msg == error_unknown) return; -# if defined(HAVE_KRB5_GET_ERROR_STRING) +# if defined(HAVE_KRB5_GET_ERROR_STRING) krb5_free_error_string(ctx, (char *) msg); -# elif defined(HAVE_KRB5_SVC_GET_MSG) +# elif defined(HAVE_KRB5_SVC_GET_MSG) krb5_free_string(ctx, (char *) msg); -# endif +# endif } #endif /* !HAVE_KRB5_FREE_ERROR_MESSAGE */ |