Death to tf_init() and friends.

[moira.git] / clients / mailmaint / mailmaint.c

diff --git a/clients/mailmaint/mailmaint.c b/clients/mailmaint/mailmaint.c
index 50afe3a95742a3817bf4fc0c5f1aa95452ec5558..c72d2568867005c94cc377a392c959a875448140 100644 (file)
--- 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);