From e7b2bde11553e8fbd34e7fb338155edefe541096 Mon Sep 17 00:00:00 2001 From: Keith Vetter Date: Tue, 18 Apr 1995 01:09:33 +0000 Subject: [PATCH] Cosmetic changes for the Windows CNS program git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5360 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/cns/changelo | 4 ++++ src/windows/cns/cns.rc | 2 +- src/windows/cns/tktlist.c | 17 +++++------------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/windows/cns/changelo b/src/windows/cns/changelo index 6d7921292..7cf06ee31 100644 --- a/src/windows/cns/changelo +++ b/src/windows/cns/changelo @@ -1,3 +1,7 @@ +Mon Apr 17 18:01:14 1995 Keith Vetter (keithv@fusion.com) + + * cns.rc, tktlist.c: better spacing for ticket info. + Thu Apr 13 16:19:01 1995 Keith Vetter (keithv@fusion.com) * cns.c: Added better error message for incorrect password. diff --git a/src/windows/cns/cns.rc b/src/windows/cns/cns.rc index 097f6b3cd..0c3fc3290 100644 --- a/src/windows/cns/cns.rc +++ b/src/windows/cns/cns.rc @@ -47,7 +47,7 @@ CAPTION KWIN_DIALOG_NAME MENU IDM_KWIN FONT 8, "Arial" BEGIN - CONTROL " Start Time End Time Ticket", IDD_TICKET_LIST_TITLE, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 16, 7, 240, 8 + CONTROL " Start Time End Time Ticket", IDD_TICKET_LIST_TITLE, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 16, 7, 240, 8 CONTROL "", IDD_TICKET_LIST, "LISTBOX", LBS_NOTIFY | LBS_DISABLENOSCROLL | LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL, 8, 18, 261, 52 #ifdef KRB4 CONTROL "&Name", IDD_LOGIN_NAME_TITLE, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 6, 69, 27, 8 diff --git a/src/windows/cns/tktlist.c b/src/windows/cns/tktlist.c index 1478ea18f..198e97bcd 100644 --- a/src/windows/cns/tktlist.c +++ b/src/windows/cns/tktlist.c @@ -28,7 +28,6 @@ #ifdef KRB5 #define NEED_SOCKETS #include "krb5.h" - #include "krbini.h" #include "com_err.h" #define DEFAULT_TKT_LIFE 120 @@ -135,10 +134,11 @@ ticket_init_list ( strcpy(buf, " "); strcat(buf, short_date(c.issue_date - kwin_get_epoch())); expiration = c.issue_date - kwin_get_epoch() + (long) c.lifetime * 5L * 60L; - strcat(buf, " "); + strcat (buf, " "); strcat(buf, short_date(expiration)); + strcat (buf, " "); l = strlen(buf); - sprintf(&buf[l], " %s%s%s%s%s (%d)", + sprintf(&buf[l], "%s%s%s%s%s (%d)", c.service, (c.instance[0] ? "." : ""), c.instance, (c.realm[0] ? "@" : ""), c.realm, c.kvno); l = strlen(buf); @@ -169,14 +169,10 @@ ticket_init_list ( flags = 0; if (code = krb5_cc_set_flags(k5_context, k5_ccache, flags)) { if (code != KRB5_FCC_NOFILE) { - //com_err (NULL, code, - // "while setting cache flags (ticket cache %s)", - // krb5_cc_get_name(k5_context, k5_ccache)); return -1; } } else { if (code = krb5_cc_start_seq_get(k5_context, k5_ccache, &cursor)) { - //com_err (NULL, code, "while starting to retrieve tickets"); return -1; } @@ -188,9 +184,9 @@ ticket_init_list ( ncred++; strcpy (buf, " "); strcat (buf, short_date (c.times.starttime - kwin_get_epoch())); - strcat (buf, " "); + strcat (buf, " "); strcat (buf, short_date (c.times.endtime - kwin_get_epoch())); - strcat (buf, " "); + strcat (buf, " "); /* Add ticket service name and realm */ code = krb5_unparse_name (k5_context, c.server, &sname); @@ -223,16 +219,13 @@ ticket_init_list ( if (code == KRB5_CC_END) { /* End of ccache */ if (code = krb5_cc_end_seq_get(k5_context, k5_ccache, &cursor)) { - //com_err(NULL, code, "while finishing ticket retrieval"); return -1; } flags = KRB5_TC_OPENCLOSE; /* turns on OPENCLOSE mode */ if (code = krb5_cc_set_flags(k5_context, k5_ccache, flags)) { - //com_err(NULL, code, "while closing ccache"); return -1; } } else { - //com_err(NULL, code, "while retrieving a ticket"); return -1; } } -- 2.26.2