===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/commands.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -c -r1.57 -r1.58
*** src/usr.bin/telnet/commands.c	2014/07/20 04:00:47	1.57
--- src/usr.bin/telnet/commands.c	2014/07/20 04:07:16	1.58
***************
*** 1,4 ****
! /*	$OpenBSD: commands.c,v 1.57 2014/07/20 04:00:47 guenther Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: commands.c,v 1.58 2014/07/20 04:07:16 guenther Exp $	*/
  /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
  
  /*
***************
*** 2088,2096 ****
      if (autologin && user == NULL) {
  	struct passwd *pw;
  
! 	user = getenv("USER");
  	if (user == NULL ||
! 	    ((pw = getpwnam(user)) && pw->pw_uid != getuid())) {
  		if ((pw = getpwuid(getuid())) != NULL)
  			user = pw->pw_name;
  		else
--- 2088,2096 ----
      if (autologin && user == NULL) {
  	struct passwd *pw;
  
! 	user = getlogin();
  	if (user == NULL ||
! 	    (pw = getpwnam(user)) == NULL || pw->pw_uid != getuid()) {
  		if ((pw = getpwuid(getuid())) != NULL)
  			user = pw->pw_name;
  		else