From dcf2aca56fd067203872a7e8c93e0d13dcbbf226 Mon Sep 17 00:00:00 2001 From: zacheiss Date: Wed, 23 Aug 2006 20:07:17 +0000 Subject: [PATCH] Death to tf_init() and friends. --- clients/mailmaint/mailmaint.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/clients/mailmaint/mailmaint.c b/clients/mailmaint/mailmaint.c index 50afe3a9..c72d2568 100644 --- a/clients/mailmaint/mailmaint.c +++ b/clients/mailmaint/mailmaint.c @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) { void (*old_hook)(const char *, long, const char *, va_list); int use_menu = 1, k_errno; - char buf[BUFSIZ], pname[ANAME_SZ]; + char buf[BUFSIZ]; if ((whoami = strrchr(argv[0], '/')) == NULL) whoami = argv[0]; @@ -163,17 +163,10 @@ int main(int argc, char *argv[]) current_li->modwith = NULL; } - if ((k_errno = tf_init(TKT_FILE, R_TKT_FIL)) || - (k_errno = tf_get_pname(pname))) - { - com_err(whoami, k_errno, "reading Kerberos ticket file"); - exit(1); - } - tf_close(); - username = pname; - - printf("Connecting to database for %s...please hold on.\n", username); - + username = mrcl_krb_user(); + if (!username) + exit(1); + if (mrcl_connect(NULL, "mailmaint", 2, 1)) exit(2); -- 2.45.2