1 files changed, 7 insertions, 1 deletions

diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index dbf5e5f6fe9f..7823ef4dcd1c 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -323,13 +323,19 @@ find_idle_and_ttywrite(w)
 {
 	extern time_t now;
 	struct stat sb;
+	time_t touched;
 
 	(void)snprintf(tbuf, sizeof(tbuf), "%s/%s", _PATH_DEV, w->tty);
 	if (stat(tbuf, &sb) < 0) {
 		warn("%s", tbuf);
 		return;
 	}
-	w->idletime = now < sb.st_atime ? 0 : now - sb.st_atime;
+	touched = sb.st_atime;
+	if (touched < w->loginat) {
+		/* tty untouched since before login */
+		touched = w->loginat;
+	}
+	w->idletime = now < touched ? 0 : now - touched;
 
 #define	TALKABLE	0220		/* tty is writable if 220 mode */
 	w->writable = ((sb.st_mode & TALKABLE) == TALKABLE);