Initial enhanced error message support, similar to what I sent to

krbdev except for some function renaming (krb5_free_error was already
in use, so added _message to everything), and the context is allowed
to be NULL (in which case we fall back to error_message() and storing
no strings) to simplify some code.

Low-level routines in the support library, using a private data
structure; higher-level routines in libkrb5, using a krb5_context.

Added error info strings to the KRB_ERR_GENERIC case in gc_via_tkt.c
and the python sample service location plugin.  Added code to kinit
and kvno to look up and display the strings.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17776 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 32 insertions, 10 deletions

diff --git a/src/clients/kvno/ChangeLog b/src/clients/kvno/ChangeLog
index 0a81427..0982dd0 100644
--- a/src/clients/kvno/ChangeLog
+++ b/src/clients/kvno/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* kvno.c: Include com_err.h.
+	(extended_com_err_fn): New function.
+	(context): New variable.
+	(main): Call set_com_err_hook.
+	(do_v5_kvno): Call com_err instead of fprintf+error_message.
+
 2004-08-31  Tom Yu  <tlyu@mit.edu>
 
 	* kvno.M: Update usage.
diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
index c860eb7..4accdb4 100644
--- a/src/clients/kvno/kvno.c
+++ b/src/clients/kvno/kvno.c
@@ -55,12 +55,18 @@ static void do_v4_kvno (int argc, char *argv[]);
 static void do_v5_kvno (int argc, char *argv[], 
                         char *ccachestr, char *etypestr);
 
+#include <com_err.h>
+static void extended_com_err_fn (const char *, errcode_t, const char *,
+				 va_list);
+
 int main(int argc, char *argv[])
 {
     int option;
     char *etypestr = 0, *ccachestr = 0;
     int v4 = 0;
 
+    set_com_err_hook (extended_com_err_fn);
+
     prog = strrchr(argv[0], '/');
     prog = prog ? (prog + 1) : argv[0];
 
@@ -149,10 +155,21 @@ static void do_v4_kvno (int count, char *names[])
 }
 
 #include <krb5.h>
+static krb5_context context;
+static void extended_com_err_fn (const char *myprog, errcode_t code,
+				 const char *fmt, va_list args)
+{
+    const char *emsg;
+    emsg = krb5_get_error_message (context, code);
+    fprintf (stderr, "%s: %s ", myprog, emsg);
+    krb5_free_error_message (context, emsg);
+    vfprintf (stderr, fmt, args);
+    fprintf (stderr, "\n");
+}
+
 static void do_v5_kvno (int count, char *names[], 
                         char * ccachestr, char *etypestr)
 {
-    krb5_context context;
     krb5_error_code ret;
     int i, errors;
     krb5_enctype etype;
@@ -203,16 +220,16 @@ static void do_v5_kvno (int count, char *names[],
 	ret = krb5_parse_name(context, names[i], &in_creds.server);
 	if (ret) {
 	    if (!quiet)
-		fprintf(stderr, "%s: %s while parsing principal name\n",
-			names[i], error_message(ret));
+		com_err(prog, ret, "while parsing principal name %s", names[i]);
 	    errors++;
 	    continue;
 	}
 
 	ret = krb5_unparse_name(context, in_creds.server, &princ);
 	if (ret) {
-	    fprintf(stderr, "%s: %s while printing principal name\n",
-		    names[i], error_message(ret));
+	    com_err(prog, ret,
+		    "while formatting parsed principal name for '%s'",
+		    names[i]);
 	    errors++;
 	    continue;
 	}
@@ -224,8 +241,7 @@ static void do_v5_kvno (int count, char *names[],
 	krb5_free_principal(context, in_creds.server);
 
 	if (ret) {
-	    fprintf(stderr, "%s: %s while getting credentials\n",
-		    princ, error_message(ret));
+	    com_err(prog, ret, "while getting credentials for %s", princ);
 
 	    krb5_free_unparsed_name(context, princ);
 
@@ -236,9 +252,7 @@ static void do_v5_kvno (int count, char *names[],
 	/* we need a native ticket */
 	ret = krb5_decode_ticket(&out_creds->ticket, &ticket);
 	if (ret) {
-	    fprintf(stderr, "%s: %s while decoding ticket\n",
-		    princ, error_message(ret));
-
+	    com_err(prog, ret, "while decoding ticket for %s", princ);
 	    krb5_free_creds(context, out_creds);
 	    krb5_free_unparsed_name(context, princ);