From 5618fc25a458cf6a0261de0097f9a3c8290b31fe Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Mon, 7 May 2001 21:04:34 +0000 Subject: [PATCH] (_warnerr): print error_string in context in preference to error string derived from error code git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9859 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/warn.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/krb5/warn.c b/lib/krb5/warn.c index b7a477ffa..278d9f898 100644 --- a/lib/krb5/warn.c +++ b/lib/krb5/warn.c @@ -47,6 +47,7 @@ _warnerr(krb5_context context, int do_errtext, char xfmt[7] = ""; const char *args[2], **arg; char *msg = NULL; + char *err_str = NULL; args[0] = args[1] = NULL; arg = args; @@ -64,11 +65,16 @@ _warnerr(krb5_context context, int do_errtext, strcat(xfmt, "%s"); - err_msg = krb5_get_err_text(context, code); - if (err_msg) - *arg++ = err_msg; - else - *arg++ = ""; + err_str = krb5_get_error_string(context); + if (err_str != NULL) { + *arg++ = err_str; + } else { + err_msg = krb5_get_err_text(context, code); + if (err_msg) + *arg++ = err_msg; + else + *arg++ = ""; + } } if(context && context->warn_dest) @@ -76,6 +82,7 @@ _warnerr(krb5_context context, int do_errtext, else warnx(xfmt, args[0], args[1]); free(msg); + free(err_str); return 0; }