From 8ae030fc3fc3527920262e234b49844b1218a304 Mon Sep 17 00:00:00 2001 From: Paul Park Date: Mon, 21 Aug 1995 21:18:03 +0000 Subject: Use libkadm string handling routines git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6562 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/ktutil/ChangeLog | 5 +++++ src/kadmin/ktutil/ktutil.c | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog index e69de29bb2..a1e71e66be 100644 --- a/src/kadmin/ktutil/ChangeLog +++ b/src/kadmin/ktutil/ChangeLog @@ -0,0 +1,5 @@ + +Mon Aug 21 17:01:40 EDT 1995 Paul Park (pjpark@mit.edu) + * ktutil.c - Remove English-specific date handling and let timestamp_ + to_sfstring() handle the formatting of the timestamp string. + diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c index ae886ba100..2e53decd8d 100644 --- a/src/kadmin/ktutil/ktutil.c +++ b/src/kadmin/ktutil/ktutil.c @@ -26,6 +26,7 @@ #include "k5-int.h" #include "ktutil.h" #include +#include "adm_proto.h" #include #include #ifdef HAS_STDLIB_H @@ -36,9 +37,6 @@ extern ss_request_table ktutil_cmds; krb5_context kcontext; krb5_kt_list ktlist = NULL; -static char *Month_names[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - int main(argc, argv) int argc; char *argv[]; @@ -203,14 +201,17 @@ void ktutil_list(argc, argv) } printf("%4d %4d ", i, lp->entry->vno); if (show_time) { + char fmtbuf[18]; + char fill; + stime = localtime((time_t *)&lp->entry->timestamp); - printf("%2d-%s-%2d %02d:%02d:%02d ", - stime->tm_mday, - Month_names[stime->tm_mon], - stime->tm_year, - stime->tm_hour, - stime->tm_min, - stime->tm_sec); + fill = ' '; + if (!krb5_timestamp_to_sfstring((krb5_timestamp)lp->entry-> + timestamp, + fmtbuf, + sizeof(fmtbuf), + &fill)) + printf(fmtbuf); } printf("%40s", pname); if (show_keys) { -- cgit