--- uip/rcvtty.c.orig	2001-04-04 16:05:17 UTC
+++ uip/rcvtty.c
@@ -8,11 +8,16 @@ static char ident[] = "@(#)$Id: rcvtty.c
 #endif
 #include "../h/mh.h"
 #include "../h/rcvmail.h"
+#include "../h/formatsbr.h"
 #include "../h/scansbr.h"
 #include "../zotnet/tws.h"
 #include <signal.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 #ifndef	TTYD
+#if __FreeBSD_version > 900007
+#include <utmpx.h>
+#else /* __FreeBSD_version > 900007 */
 #include <utmp.h>
 #ifndef UTMP_FILENAME
 #ifdef UTMP_FILE
@@ -25,6 +30,7 @@ static char ident[] = "@(#)$Id: rcvtty.c
 #endif
 #endif
 #endif	/* UTMP_FILENAME */
+#endif /* __FreeBSD_version > 900007 */
 #endif	/* not TTYD */
 #ifdef LOCALE
 #include	<locale.h>
@@ -110,8 +116,12 @@ char   **argv;
 	   *vec[MAXARGS];
 #ifndef	TTYD
     char    tty[BUFSIZ];
+#if __FreeBSD_version > 900007
+    struct utmpx *ut;
+#else /* __FreeBSD_version > 900007 */
     struct utmp ut;
     register FILE  *uf;
+#endif /* __FreeBSD_version > 900007 */
 #endif	/* not TTYD */
 
 #ifdef BSD43
@@ -200,6 +210,13 @@ char   **argv;
 
     user = getusr ();
 #ifndef	TTYD
+#if __FreeBSD_version > 900007
+    ut = getutxuser(user);
+    if (ut != NULL) {
+	(void) strncpy (tty, ut->ut_line, sizeof ut->ut_line);
+	alert (tty, md);
+    }
+#else /* __FreeBSD_version > 900007 */
     if ((uf = fopen (UTMP_FILENAME, "r")) == NULL)
 	exit (RCV_MBX);
     while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
@@ -212,6 +229,7 @@ char   **argv;
 	    alert (tty, md);
 	}
     (void) fclose (uf);
+#endif /* __FreeBSD_version > 900007 */
 #else	/* TTYD */
     alert (user, md);
 #endif	/* TTYD */