(krb5_kt_get_entry): avoid printing 0 (wildcard kvno) after principal
when the keytab entry isn't found, reported by Chris Chiappa <chris@chiappa.net> git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11928 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -328,17 +328,20 @@ krb5_kt_get_entry(krb5_context context,
|
|||||||
if (entry->vno) {
|
if (entry->vno) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} 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_unparse_name_fixed (context, principal, princ, sizeof(princ));
|
||||||
krb5_kt_get_name (context, id, kt_name, sizeof(kt_name));
|
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,
|
krb5_set_error_string (context,
|
||||||
"failed to find %s%s%d%s in keytab %s",
|
"failed to find %s%s in keytab %s",
|
||||||
princ,
|
princ,
|
||||||
kvno ? "(" : "",
|
kvno_str,
|
||||||
kvno,
|
|
||||||
kvno ? ")" : "",
|
|
||||||
kt_name);
|
kt_name);
|
||||||
return KRB5_KT_NOTFOUND;
|
return KRB5_KT_NOTFOUND;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user