print key versions numbers of v4 tickets in verbose mode
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9192 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -58,6 +58,7 @@ printable_time_long(time_t t)
|
|||||||
#define COL_EXPIRES " Expires"
|
#define COL_EXPIRES " Expires"
|
||||||
#define COL_FLAGS "Flags"
|
#define COL_FLAGS "Flags"
|
||||||
#define COL_PRINCIPAL " Principal"
|
#define COL_PRINCIPAL " Principal"
|
||||||
|
#define COL_PRINCIPAL_KVNO " Principal (kvno)"
|
||||||
|
|
||||||
static void
|
static void
|
||||||
print_cred(krb5_context context, krb5_creds *cred, rtbl_t ct, int do_flags)
|
print_cred(krb5_context context, krb5_creds *cred, rtbl_t ct, int do_flags)
|
||||||
@@ -412,6 +413,9 @@ display_v4_tickets (int do_verbose)
|
|||||||
ct = rtbl_create();
|
ct = rtbl_create();
|
||||||
rtbl_add_column(ct, COL_ISSUED, 0);
|
rtbl_add_column(ct, COL_ISSUED, 0);
|
||||||
rtbl_add_column(ct, COL_EXPIRES, 0);
|
rtbl_add_column(ct, COL_EXPIRES, 0);
|
||||||
|
if (do_verbose)
|
||||||
|
rtbl_add_column(ct, COL_PRINCIPAL_KVNO, 0);
|
||||||
|
else
|
||||||
rtbl_add_column(ct, COL_PRINCIPAL, 0);
|
rtbl_add_column(ct, COL_PRINCIPAL, 0);
|
||||||
rtbl_set_prefix(ct, " ");
|
rtbl_set_prefix(ct, " ");
|
||||||
rtbl_set_column_prefix(ct, COL_ISSUED, "");
|
rtbl_set_column_prefix(ct, COL_ISSUED, "");
|
||||||
@@ -419,6 +423,8 @@ display_v4_tickets (int do_verbose)
|
|||||||
while ((ret = tf_get_cred(&cred)) == KSUCCESS) {
|
while ((ret = tf_get_cred(&cred)) == KSUCCESS) {
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
char buf1[20], buf2[20];
|
char buf1[20], buf2[20];
|
||||||
|
const char *pp;
|
||||||
|
|
||||||
found++;
|
found++;
|
||||||
|
|
||||||
strlcpy(buf1,
|
strlcpy(buf1,
|
||||||
@@ -436,10 +442,18 @@ display_v4_tickets (int do_verbose)
|
|||||||
sizeof(buf2));
|
sizeof(buf2));
|
||||||
rtbl_add_column_entry(ct, COL_ISSUED, buf1);
|
rtbl_add_column_entry(ct, COL_ISSUED, buf1);
|
||||||
rtbl_add_column_entry(ct, COL_EXPIRES, buf2);
|
rtbl_add_column_entry(ct, COL_EXPIRES, buf2);
|
||||||
rtbl_add_column_entry(ct, COL_PRINCIPAL,
|
pp = krb_unparse_name_long(cred.service,
|
||||||
krb_unparse_name_long(cred.service,
|
|
||||||
cred.instance,
|
cred.instance,
|
||||||
cred.realm));
|
cred.realm);
|
||||||
|
if (do_verbose) {
|
||||||
|
char *tmp;
|
||||||
|
|
||||||
|
asprintf(&tmp, "%s (%d)", pp, cred.kvno);
|
||||||
|
rtbl_add_column_entry(ct, COL_PRINCIPAL_KVNO, tmp);
|
||||||
|
free(tmp);
|
||||||
|
} else {
|
||||||
|
rtbl_add_column_entry(ct, COL_PRINCIPAL, pp);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
rtbl_format(ct, stdout);
|
rtbl_format(ct, stdout);
|
||||||
rtbl_destroy(ct);
|
rtbl_destroy(ct);
|
||||||
|
Reference in New Issue
Block a user