From 20b62ed217cdbce16621ba46a8b9352d39236af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Groenvall?= <bg@sics.se>
Date: Mon, 12 Jul 1999 10:25:22 +0000
Subject: [PATCH] Make compatible interpretation of $USER.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6449 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/telnet/commands.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c
index 4218b0137..dc187a052 100644
--- a/appl/telnet/telnet/commands.c
+++ b/appl/telnet/telnet/commands.c
@@ -2336,8 +2336,18 @@ tn(int argc, char **argv)
 #endif
     } while (connected == 0);
     cmdrc(hostp, hostname);
-    if (autologin && user == NULL)
-	user = (char *)get_default_username ();
+    if (autologin && user == NULL) {
+	struct passwd *pw;
+
+	user = (char *)get_default_username();
+	if (user == NULL ||
+	    ((pw = k_getpwnam((char *)user)) && pw->pw_uid != getuid())) {
+		if ((pw = k_getpwuid(getuid())))
+			user = pw->pw_name;
+		else
+			user = NULL;
+	}
+    }
     if (user) {
 	env_define((unsigned char *)"USER", (unsigned char *)user);
 	env_export((unsigned char *)"USER");