From a732676a92d5800b46a4eb7213e50221b7ff40fe Mon Sep 17 00:00:00 2001
From: joerg <joerg@FreeBSD.org>
Date: Sun, 5 Mar 1995 08:27:14 +0000
Subject: Use `interactive' (foreground) delivery by default.  The old
 behaviour of queuing mails only can be restored by uncommenting a CFLAGS+=
 line in the makefile, so sites that _really_ need this (perhaps some huge
 mail hubs) can still have it.  The majority of FreeBSD boxes is better served
 with an immediate delivery (and last time i've been asking on the list,
 nobody complained).

---
 bin/rmail/Makefile | 6 +++++-
 bin/rmail/rmail.c  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index 2623be5..ca3c69c 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -1,7 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.3 1994/09/24 02:57:03 davidg Exp $
 
 PROG=	rmail
 MAN8=	rmail.8
 
+# If you want to have your rmail queuing the mail only, uncomment the
+# following:
+# CFLAGS+= -DQUEUE_ONLY
+
 .include <bsd.prog.mk>
diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index 4192222..fda2619 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: rmail.c,v 1.2 1994/09/24 02:57:06 davidg Exp $
  */
 
 #ifndef lint
@@ -228,7 +228,11 @@ main(argc, argv)
 	i = 0;
 	args[i++] = _PATH_SENDMAIL;	/* Build sendmail's argument list. */
 	args[i++] = "-oee";		/* No errors, just status. */
+#ifdef QUEUE_ONLY
 	args[i++] = "-odq";		/* Queue it, don't try to deliver. */
+#else
+	args[i++] = "-odi";		/* Deliver in foreground. */
+#endif
 	args[i++] = "-oi";		/* Ignore '.' on a line by itself. */
 
 	if (from_sys != NULL) {		/* Set sender's host name. */
-- 
cgit v1.1