From 6eb8e7a3ed28b34bfce6d8d37f23d89da6af75f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 27 Mar 2003 03:45:01 +0000 Subject: [PATCH] (krb5_kt_get_entry): avoid printing 0 (wildcard kvno) after principal when the keytab entry isn't found, reported by Chris Chiappa git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11928 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/keytab.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c index cd9391153..2aa4fc8b0 100644 --- a/lib/krb5/keytab.c +++ b/lib/krb5/keytab.c @@ -328,17 +328,20 @@ krb5_kt_get_entry(krb5_context context, if (entry->vno) { return 0; } else { - char princ[256], kt_name[256]; + char princ[256], kt_name[256], kvno_str[25]; krb5_unparse_name_fixed (context, principal, princ, sizeof(princ)); krb5_kt_get_name (context, id, kt_name, sizeof(kt_name)); + if (kvno) + snprintf(kvno_str, sizeof(kvno_str), "(kvno %d)", kvno); + else + kvno_str[0] = '\0'; + krb5_set_error_string (context, - "failed to find %s%s%d%s in keytab %s", + "failed to find %s%s in keytab %s", princ, - kvno ? "(" : "", - kvno, - kvno ? ")" : "", + kvno_str, kt_name); return KRB5_KT_NOTFOUND; }