diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-01-21 22:21:43 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-01-21 22:21:43 +0000 |
| commit | e804c25cafdf47cc91627155f1389c81fa997eca (patch) | |
| tree | 115a2c1b4e339bc9c060e940ec6ae17826a0f7e0 /contrib/sendmail/rmail | |
| parent | c5e098efbef941858129b84a112a036d572ba53c (diff) | |
| download | FreeBSD-src-e804c25cafdf47cc91627155f1389c81fa997eca.zip FreeBSD-src-e804c25cafdf47cc91627155f1389c81fa997eca.tar.gz | |
Repair 8.11.2 merge conflicts
Diffstat (limited to 'contrib/sendmail/rmail')
| -rw-r--r-- | contrib/sendmail/rmail/rmail.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c index 79f8b92..d5f1ad7 100644 --- a/contrib/sendmail/rmail/rmail.c +++ b/contrib/sendmail/rmail/rmail.c @@ -19,7 +19,7 @@ static char copyright[] = #endif /* ! lint */ #ifndef lint -static char id[] = "@(#)$Id: rmail.c,v 8.39.4.8 2000/09/16 22:20:25 gshapiro Exp $"; +static char id[] = "@(#)$Id: rmail.c,v 8.39.4.9 2000/11/17 08:42:56 gshapiro Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -313,12 +313,11 @@ main(argc, argv) } - /* Allocate args (with room for sendmail args as well as recipients */ + /* Allocate args (with room for sendmail args as well as recipients) */ args = (char **)xalloc(sizeof(*args) * (10 + argc)); i = 0; args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */ - args[i++] = "-G"; /* relay submission */ args[i++] = "-oee"; /* No errors, just status. */ #ifdef QUEUE_ONLY args[i++] = "-odq"; /* Queue it, don't try to deliver. */ |
