===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vacation/vacation.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/vacation/vacation.c	1997/07/29 16:48:13	1.7
--- src/usr.bin/vacation/vacation.c	1997/08/06 23:47:09	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: vacation.c,v 1.7 1997/07/29 16:48:13 deraadt Exp $	*/
  /*	$NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: vacation.c,v 1.8 1997/08/06 23:47:09 deraadt Exp $	*/
  /*	$NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $	*/
  
  /*
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "@(#)vacation.c	8.2 (Berkeley) 1/26/94";
  #endif
! static char rcsid[] = "$OpenBSD: vacation.c,v 1.7 1997/07/29 16:48:13 deraadt Exp $";
  #endif /* not lint */
  
  /*
--- 44,50 ----
  #if 0
  static char sccsid[] = "@(#)vacation.c	8.2 (Berkeley) 1/26/94";
  #endif
! static char rcsid[] = "$OpenBSD: vacation.c,v 1.8 1997/08/06 23:47:09 deraadt Exp $";
  #endif /* not lint */
  
  /*
***************
*** 421,427 ****
  		close(pvect[0]);
  		close(pvect[1]);
  		fclose(mfp);
! 		execl(_PATH_SENDMAIL, "sendmail", "-t", NULL);
  		syslog(LOG_ERR, "vacation: can't exec %s: %s",
  			_PATH_SENDMAIL, strerror(errno));
  		_exit(1);
--- 421,428 ----
  		close(pvect[0]);
  		close(pvect[1]);
  		fclose(mfp);
! 		execl(_PATH_SENDMAIL, "sendmail", "-f", myname, "--",
! 		    from, NULL);
  		syslog(LOG_ERR, "vacation: can't exec %s: %s",
  			_PATH_SENDMAIL, strerror(errno));
  		_exit(1);
***************
*** 429,435 ****
  	close(pvect[0]);
  	sfp = fdopen(pvect[1], "w");
  	fprintf(sfp, "To: %s\n", from);
- 	fprintf(sfp, "From: %s\n", myname);
  	while (fgets(buf, sizeof buf, mfp))
  		fputs(buf, sfp);
  	fclose(mfp);
--- 430,435 ----