diff options
| author | peter <peter@FreeBSD.org> | 1996-10-29 11:32:22 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-10-29 11:32:22 +0000 |
| commit | f46f416def576e27bbd8694b5c0024103f56434f (patch) | |
| tree | 293810ab80b4e4defe35220c6605e09d0a276b75 /usr.sbin/sendmail | |
| parent | 6331e7c87d773f23bb5c9ff048dbbd74a620890f (diff) | |
| download | FreeBSD-src-f46f416def576e27bbd8694b5c0024103f56434f.zip FreeBSD-src-f46f416def576e27bbd8694b5c0024103f56434f.tar.gz | |
Integrate our changes from bin/rmail. Mainly it causes immediate
delivery rather than queueing it and forgetting it.
(and some -Wall fixes where gcc is too dumb to see it's a "cant happen")
Diffstat (limited to 'usr.sbin/sendmail')
| -rw-r--r-- | usr.sbin/sendmail/rmail/Makefile | 9 | ||||
| -rw-r--r-- | usr.sbin/sendmail/rmail/rmail.c | 8 |
2 files changed, 16 insertions, 1 deletions
diff --git a/usr.sbin/sendmail/rmail/Makefile b/usr.sbin/sendmail/rmail/Makefile index eb2fb48..731e81c 100644 --- a/usr.sbin/sendmail/rmail/Makefile +++ b/usr.sbin/sendmail/rmail/Makefile @@ -1,6 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 +# $Id$ PROG= rmail -MAN8= rmail.0 +MAN8= rmail.8 + +# If you want to have your rmail queuing the mail only, uncomment the +# following: +# CFLAGS+= -DQUEUE_ONLY + +BINDIR= /bin .include <bsd.prog.mk> diff --git a/usr.sbin/sendmail/rmail/rmail.c b/usr.sbin/sendmail/rmail/rmail.c index 29af02a..7a33f54 100644 --- a/usr.sbin/sendmail/rmail/rmail.c +++ b/usr.sbin/sendmail/rmail/rmail.c @@ -29,6 +29,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $Id$ */ #ifndef lint @@ -121,6 +123,8 @@ main(argc, argv) if (argc < 1) usage(); + fplen = fptlen = 0; + addrp = ""; from_path = from_sys = from_user = NULL; for (offset = 0;;) { @@ -232,7 +236,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. */ /* set from system and protocol used */ |
