From d6bff3199dc4dea17dedafb89c0aac73ac7ba622 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 26 Sep 2011 01:56:14 -0400 Subject: [PATCH] add cache type column to kswitch output Change-Id: I6b27ba6f7c853da56f81b45b312ef06e13f2dbb0 --- kuser/kswitch.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/kuser/kswitch.c b/kuser/kswitch.c index 974af85ac..cdb6ee11c 100644 --- a/kuser/kswitch.c +++ b/kuser/kswitch.c @@ -75,9 +75,11 @@ kswitch(struct kswitch_options *opt, int argc, char **argv) ct = rtbl_create(); - rtbl_add_column(ct, "", 0); - rtbl_add_column(ct, "Principal", 0); - rtbl_set_column_prefix(ct, "Principal", " "); + rtbl_add_column_by_id(ct, 0, "#", 0); + rtbl_add_column_by_id(ct, 1, "Principal", 0); + rtbl_set_column_affix_by_id(ct, 1, " ", ""); + rtbl_add_column_by_id(ct, 2, "Type", 0); + rtbl_set_column_affix_by_id(ct, 2, " ", ""); ret = krb5_cc_cache_get_first(kcc_context, NULL, &cursor); if (ret) @@ -95,8 +97,9 @@ kswitch(struct kswitch_options *opt, int argc, char **argv) krb5_free_principal(kcc_context, p); snprintf(num, sizeof(num), "%d", (int)(len + 1)); - rtbl_add_column_entry(ct, "", num); - rtbl_add_column_entry(ct, "Principal", name); + rtbl_add_column_entry_by_id(ct, 0, num); + rtbl_add_column_entry_by_id(ct, 1, name); + rtbl_add_column_entry_by_id(ct, 2, krb5_cc_get_type(kcc_context, id)); free(name); ids = erealloc(ids, (len + 1) * sizeof(ids[0]));