From: millert <millert@openbsd.org>
Date: Thu, 22 Jan 2015 16:25:07 +0000 (+0000)
Subject: Only allow the -r flag when sending a message; from Martin Brandenburg
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ba62a43212959b6a6f2ad735a19ccc37152ce125;p=openbsd

Only allow the -r flag when sending a message; from Martin Brandenburg
---

diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index eb02c18b57c..a9d22de475b 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.28 2015/01/20 16:59:07 millert Exp $	*/
+/*	$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,8 +185,10 @@ main(int argc, char **argv)
 	/*
 	 * 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");
+	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.
 	 */