From a7b5808b5df9e54ef8a8a7ac24e5faad458ddbce Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Sat, 24 May 2014 12:15:32 -0400 Subject: Use k5_setmsg Replace most calls to krb5_set_error_message with k5_setmsg for brevity. Leave alone plugin sources where we don't include k5-int.h (mostly PKINIT). --- src/lib/gssapi/krb5/acquire_cred.c | 5 ++--- src/lib/gssapi/krb5/disp_status.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/gssapi') diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c index a31bc11ce..f952f64cc 100644 --- a/src/lib/gssapi/krb5/acquire_cred.c +++ b/src/lib/gssapi/krb5/acquire_cred.c @@ -162,9 +162,8 @@ check_keytab(krb5_context context, krb5_keytab kt, krb5_gss_name_t name) if (code == KRB5_KT_END) { code = KRB5_KT_NOTFOUND; if (krb5_unparse_name(context, accprinc, &princname) == 0) { - krb5_set_error_message(context, code, - _("No key table entry found matching %s"), - princname); + k5_setmsg(context, code, _("No key table entry found matching %s"), + princname); free(princname); } } diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c index 69c3cb9af..6ff62a9d8 100644 --- a/src/lib/gssapi/krb5/disp_status.c +++ b/src/lib/gssapi/krb5/disp_status.c @@ -142,7 +142,7 @@ void krb5_gss_save_error_info(OM_uint32 minor_code, krb5_context ctx) save_error_string(minor_code, s); /* The get_error_message call above resets the error message in ctx. Put it back, in case we make this call again *sigh*. */ - krb5_set_error_message(ctx, (krb5_error_code)minor_code, "%s", s); + k5_setmsg(ctx, (krb5_error_code)minor_code, "%s", s); krb5_free_error_message(ctx, s); } void krb5_gss_delete_error_info(void *p) -- cgit