===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** src/usr.bin/mail/main.c	2015/01/20 16:59:07	1.28
--- src/usr.bin/mail/main.c	2015/01/22 16:25:07	1.29
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.28 2015/01/20 16:59:07 millert Exp $	*/
  /*	$NetBSD: main.c,v 1.7 1997/05/13 06:15:57 mikel Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.29 2015/01/22 16:25:07 millert Exp $	*/
  /*	$NetBSD: main.c,v 1.7 1997/05/13 06:15:57 mikel Exp $	*/
  
  /*
***************
*** 185,192 ****
  	/*
  	 * Check for inconsistent arguments.
  	 */
! 	if (to == NULL && (subject != NULL || cc != NULL || bcc != NULL))
! 		errx(1, "You must specify direct recipients with -s, -c, or -b");
  	/*
  	 * Block SIGINT except where we install an explicit handler for it.
  	 */
--- 185,194 ----
  	/*
  	 * Check for inconsistent arguments.
  	 */
! 	if (to == NULL && (subject != NULL || cc != NULL || bcc != NULL ||
! 	    fromaddr != NULL))
! 		errx(1, "You must specify direct recipients with -s, -c, -b, "
! 		    "or -r");
  	/*
  	 * Block SIGINT except where we install an explicit handler for it.
  	 */