===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/names.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/mail/names.c	2014/08/15 03:51:40	1.20
--- src/usr.bin/mail/names.c	2014/12/16 18:36:46	1.21
***************
*** 1,4 ****
! /*	$OpenBSD: names.c,v 1.20 2014/08/15 03:51:40 guenther Exp $	*/
  /*	$NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: names.c,v 1.21 2014/12/16 18:36:46 millert Exp $	*/
  /*	$NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $	*/
  
  /*
***************
*** 208,213 ****
--- 208,216 ----
  	time_t now;
  	char *date, *fname;
  	FILE *fout, *fin;
+ 
+ 	if (value("expandaddr") == NULL)
+ 		return(names);
  
  	top = names;
  	np = names;