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).
This commit is contained in:
Joerg Wunsch 1995-03-05 08:27:14 +00:00
parent 3c931b7071
commit 2723e3d4c6
2 changed files with 10 additions and 2 deletions

View File

@ -1,7 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93 # @(#)Makefile 8.1 (Berkeley) 5/31/93
# $Id$ # $Id: Makefile,v 1.3 1994/09/24 02:57:03 davidg Exp $
PROG= rmail PROG= rmail
MAN8= rmail.8 MAN8= rmail.8
# If you want to have your rmail queuing the mail only, uncomment the
# following:
# CFLAGS+= -DQUEUE_ONLY
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id$ * $Id: rmail.c,v 1.2 1994/09/24 02:57:06 davidg Exp $
*/ */
#ifndef lint #ifndef lint
@ -228,7 +228,11 @@ main(argc, argv)
i = 0; i = 0;
args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */ args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */
args[i++] = "-oee"; /* No errors, just status. */ args[i++] = "-oee"; /* No errors, just status. */
#ifdef QUEUE_ONLY
args[i++] = "-odq"; /* Queue it, don't try to deliver. */ 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. */ args[i++] = "-oi"; /* Ignore '.' on a line by itself. */
if (from_sys != NULL) { /* Set sender's host name. */ if (from_sys != NULL) { /* Set sender's host name. */