===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/v7.local.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/mail/v7.local.c	1996/06/11 12:53:53	1.2
--- src/usr.bin/mail/v7.local.c	1996/10/26 05:11:05	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: v7.local.c,v 1.2 1996/06/11 12:53:53 deraadt Exp $	*/
  /*	$NetBSD: v7.local.c,v 1.7 1996/06/08 19:48:44 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: v7.local.c,v 1.3 1996/10/26 05:11:05 millert Exp $	*/
  /*	$NetBSD: v7.local.c,v 1.7 1996/06/08 19:48:44 christos Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)v7.local.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: v7.local.c,v 1.2 1996/06/11 12:53:53 deraadt Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)v7.local.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: v7.local.c,v 1.3 1996/10/26 05:11:05 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 92,97 ****
--- 92,99 ----
  	uid_t uid;
  
  	if ((np = getenv("USER")) != NOSTR)
+ 		return np;
+ 	if ((np = getenv("LOGNAME")) != NOSTR)
  		return np;
  	if ((np = getname(uid = getuid())) != NOSTR)
  		return np;