Import Sendmail-8.7.2 as discussed on -current.

The conflict merge will happen shortly after.

10 files changed, 323 insertions, 83 deletions

diff --git a/usr.sbin/sendmail/cf/mailer/cyrus.m4 b/usr.sbin/sendmail/cf/mailer/cyrus.m4
new file mode 100644
index 0000000..f531137
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/cyrus.m4
@@ -0,0 +1,44 @@
+PUSHDIVERT(-1)
+#
+#	(C) Copyright 1995 by Carnegie Mellon University
+# 
+#                      All Rights Reserved
+# 
+# Permission to use, copy, modify, and distribute this software and its 
+# documentation for any purpose and without fee is hereby granted, 
+# provided that the above copyright notice appear in all copies and that
+# both that copyright notice and this permission notice appear in 
+# supporting documentation, and that the name of CMU not be
+# used in advertising or publicity pertaining to distribution of the
+# software without specific, written prior permission.  
+# 
+# CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+# ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+# CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+# ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+# SOFTWARE.
+#
+#	Contributed to Berkeley by John Gardiner Myers <jgm+@CMU.EDU>.
+# 
+
+ifdef(`CYRUS_MAILER_FLAGS',, `define(`CYRUS_MAILER_FLAGS', `A5@')')
+ifdef(`CYRUS_MAILER_PATH',, `define(`CYRUS_MAILER_PATH', /usr/cyrus/bin/deliver)')
+ifdef(`CYRUS_MAILER_ARGS',, `define(`CYRUS_MAILER_ARGS', `deliver -e -m $h -- $u')')
+ifdef(`CYRUS_BB_MAILER_FLAGS',, `define(`CYRUS_BB_MAILER_FLAGS', `')')
+ifdef(`CYRUS_BB_MAILER_ARGS',, `define(`CYRUS_BB_MAILER_ARGS', `deliver -e -m $u')')
+
+POPDIVERT
+
+##################################################
+###   Cyrus Mailer specification               ###
+##################################################
+
+VERSIONID(`@(#)cyrus.m4	8.2 (Carnegie Mellon) 9/12/95')
+
+Mcyrus,		P=CYRUS_MAILER_PATH, F=CONCAT(`lsDFMnP', CYRUS_MAILER_FLAGS), S=10, R=20/40, T=X-Unix,
+		ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')A=CYRUS_MAILER_ARGS
+
+Mcyrusbb,	P=CYRUS_MAILER_PATH, F=CONCAT(`lsDFMnP', CYRUS_MAILER_FLAGS), S=10, R=20/40, T=X-Unix,
+		ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')A=CYRUS_BB_MAILER_ARGS
diff --git a/usr.sbin/sendmail/cf/mailer/fax.m4 b/usr.sbin/sendmail/cf/mailer/fax.m4
index 0c98a3b..777fe01 100644
--- a/usr.sbin/sendmail/cf/mailer/fax.m4
+++ b/usr.sbin/sendmail/cf/mailer/fax.m4
@@ -44,7 +44,10 @@ POPDIVERT
 ###   FAX Mailer specification   ###
 ####################################
 
-VERSIONID(`@(#)fax.m4	8.2 (Berkeley) 1/24/94')
+VERSIONID(`@(#)fax.m4	8.4 (Berkeley) 10/10/95')
 
-Mfax,		P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24, M=FAX_MAILER_MAX,
+Mfax,		P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24, M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix,
 		A=mailfax $u $h $f
+
+LOCAL_CONFIG
+CPFAX
diff --git a/usr.sbin/sendmail/cf/mailer/local.m4 b/usr.sbin/sendmail/cf/mailer/local.m4
index 24a8204..124cbba 100644
--- a/usr.sbin/sendmail/cf/mailer/local.m4
+++ b/usr.sbin/sendmail/cf/mailer/local.m4
@@ -38,29 +38,57 @@ ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -d $u')')
 ifdef(`LOCAL_SHELL_FLAGS',, `define(`LOCAL_SHELL_FLAGS', `eu')')
 ifdef(`LOCAL_SHELL_PATH',, `define(`LOCAL_SHELL_PATH', /bin/sh)')
 ifdef(`LOCAL_SHELL_ARGS',, `define(`LOCAL_SHELL_ARGS', `sh -c $u')')
+ifdef(`LOCAL_SHELL_DIR',, `define(`LOCAL_SHELL_DIR', `$z:/')')
 POPDIVERT
 
 ##################################################
 ###   Local and Program Mailer specification   ###
 ##################################################
 
-VERSIONID(`@(#)local.m4	8.6 (Berkeley) 10/24/93')
+VERSIONID(`@(#)local.m4	8.21 (Berkeley) 11/6/95')
 
-Mlocal,		P=LOCAL_MAILER_PATH, F=CONCAT(`lsDFM', LOCAL_MAILER_FLAGS), S=10, R=20/40,
+Mlocal,		P=LOCAL_MAILER_PATH, F=CONCAT(`lsDFMAw5:/|@', LOCAL_MAILER_FLAGS), S=10/30, R=20/40,
+		_OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/X-Unix,
 		A=LOCAL_MAILER_ARGS
-Mprog,		P=LOCAL_SHELL_PATH, F=CONCAT(`lsDFM', LOCAL_SHELL_FLAGS), S=10, R=20/40, D=$z:/,
+Mprog,		P=LOCAL_SHELL_PATH, F=CONCAT(`lsDFMo', LOCAL_SHELL_FLAGS), S=10/30, R=20/40, D=LOCAL_SHELL_DIR,
+		_OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')T=X-Unix,
 		A=LOCAL_SHELL_ARGS
 
+#
+#  Envelope sender rewriting
+#
 S10
 R<@>			$n			errors to mailer-daemon
-R$+			$: $>40 $1
+R$+			$: $>50 $1		add local domain if needed
+R$*			$: $>94 $1		do masquerading
 
+#
+#  Envelope recipient rewriting
+#
 S20
 R$+ < @ $* >		$: $1			strip host part
 
+#
+#  Header sender rewriting
+#
+S30
+R<@>			$n			errors to mailer-daemon
+R$+			$: $>50 $1		add local domain if needed
+R$*			$: $>93 $1		do masquerading
+
+#
+#  Header recipient rewriting
+#
 S40
-ifdef(`_ALWAYS_ADD_DOMAIN_',
-`R$* < @ $* > $*		$@ $1 < @ $2 > $3	already fully qualified
-R$*			$: $1 @ $M		add local qualification
-R$* @			$: $1 @ $j		if $M not defined',
-`dnl')
+R$+			$: $>50 $1		add local domain if needed
+ifdef(`_ALL_MASQUERADE_', `', `#')dnl
+R$*			$: $>93 $1		do all-masquerading
+
+#
+#  Common code to add local domain name (only if always-add-domain)
+#
+S50
+ifdef(`_ALWAYS_ADD_DOMAIN_', `', `#')dnl
+R$* < @ $* > $* 	$@ $1 < @ $2 > $3		already fully qualified
+ifdef(`_ALWAYS_ADD_DOMAIN_', `', `#')dnl
+R$+			$@ $1 < @ *LOCAL* >		add local qualification
diff --git a/usr.sbin/sendmail/cf/mailer/mail11.m4 b/usr.sbin/sendmail/cf/mailer/mail11.m4
new file mode 100644
index 0000000..21e05dd
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/mail11.m4
@@ -0,0 +1,50 @@
+PUSHDIVERT(-1)
+#
+# Not exciting enough to bother with copyrights and most of the
+# rulesets are based from those provided by DEC.
+# Barb Dijker, Labyrinth Computer Services, barb@labyrinth.com
+#
+# This mailer is only useful if you have DECNET and the
+# mail11 program - gatekeeper.dec.com:/pub/DEC/gwtools.
+# 
+# For local delivery of DECNET style addresses to the local
+# DECNET node, you will need feature(use_cw_file) and put
+# your DECNET nodename in in the cw file.
+#
+ifdef(`MAIL11_MAILER_PATH',, `define(`MAIL11_MAILER_PATH', /usr/etc/mail11)')
+ifdef(`MAIL11_MAILER_FLAGS',, `define(`MAIL11_MAILER_FLAGS', nsFx)')
+ifdef(`MAIL11_MAILER_ARGS',, `define(`MAIL11_MAILER_ARGS', mail11 $g $x $h $u)')
+define(`_USE_DECNET_SYNTAX_')
+
+POPDIVERT
+
+PUSHDIVERT(3)
+# DECNET delivery
+R$* < @ $=w .DECNET. >		$#local $: $1			local DECnet
+R$+ < @ $+ .DECNET. >		$#mail11 $@ $2 $: $1		DECnet user
+POPDIVERT
+
+PUSHDIVERT(6)
+CPDECNET
+POPDIVERT
+
+###########################################
+###   UTK-MAIL11 Mailer specification   ###
+###########################################
+
+VERSIONID(`@(#)mail11.m4	8.1 (Berkeley) 5/23/95')
+
+Mmail11, P=MAIL11_MAILER_PATH, F=MAIL11_MAILER_FLAGS, S=15, R=25,
+	A=MAIL11_MAILER_ARGS
+
+S15
+R$+			$: $>25 $1		preprocess
+R$w :: $+		$@ $w :: $1		ready to go
+
+S25
+R$+ < @ $- .UUCP >	$: $2 ! $1		back to old style
+R$+ < @ $- .DECNET >	$: $2 :: $1		convert to DECnet style
+R$+ < @ $- .LOCAL >	$: $2 :: $1		convert to DECnet style
+R$+ < @ $=w. >		$: $2 :: $1		convert to DECnet style
+R$=w :: $+		$2			strip local names
+R$+ :: $+		$@ $1 :: $2		already qualified
diff --git a/usr.sbin/sendmail/cf/mailer/phquery.m4 b/usr.sbin/sendmail/cf/mailer/phquery.m4
new file mode 100644
index 0000000..ee359e0
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/phquery.m4
@@ -0,0 +1,51 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# 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.
+#
+#  Contributed by Kimmo Suominen <kim@tac.nyc.ny.us>.
+#
+
+ifdef(`PH_MAILER_PATH',, `define(`PH_MAILER_PATH', /usr/local/etc/phquery)')
+ifdef(`PH_MAILER_FLAGS',, `define(`PH_MAILER_FLAGS', `ehmu')')
+ifdef(`PH_MAILER_ARGS',, `define(`PH_MAILER_ARGS', `phquery -- $u')')
+
+POPDIVERT
+
+####################################
+###   PH Mailer specification   ###
+####################################
+
+VERSIONID(`@(#)phquery.m4	8.1 (Berkeley) 8/1/95')
+
+Mph,		P=PH_MAILER_PATH, F=CONCAT(`nrDFM', PH_MAILER_FLAGS), S=10, R=20/40,
+		A=PH_MAILER_ARGS
diff --git a/usr.sbin/sendmail/cf/mailer/pop.m4 b/usr.sbin/sendmail/cf/mailer/pop.m4
index 92bcff9..210a3c8 100644
--- a/usr.sbin/sendmail/cf/mailer/pop.m4
+++ b/usr.sbin/sendmail/cf/mailer/pop.m4
@@ -34,7 +34,7 @@ PUSHDIVERT(-1)
 #
 
 ifdef(`POP_MAILER_PATH',, `define(`POP_MAILER_PATH', /usr/lib/mh/spop)')
-ifdef(`POP_MAILER_FLAGS',, `define(`POP_MAILER_FLAGS', `eu')')
+ifdef(`POP_MAILER_FLAGS',, `define(`POP_MAILER_FLAGS', `Penu')')
 ifdef(`POP_MAILER_ARGS',, `define(`POP_MAILER_ARGS', `pop $u')')
 
 POPDIVERT
@@ -43,9 +43,9 @@ POPDIVERT
 ###   POP Mailer specification   ###
 ####################################
 
-VERSIONID(`@(#)pop.m4	8.2 (Berkeley) 2/19/94')
+VERSIONID(`@(#)pop.m4	8.5 (Berkeley) 4/23/95')
 
-Mpop,		P=POP_MAILER_PATH, F=CONCAT(`lsDFM', POP_MAILER_FLAGS), S=10, R=20/40,
+Mpop,		P=POP_MAILER_PATH, F=CONCAT(`lsDFM', POP_MAILER_FLAGS), S=10, R=20/40, T=DNS/RFC822/X-Unix,
 		A=POP_MAILER_ARGS
 
 LOCAL_CONFIG
diff --git a/usr.sbin/sendmail/cf/mailer/procmail.m4 b/usr.sbin/sendmail/cf/mailer/procmail.m4
new file mode 100644
index 0000000..d1293b9
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/procmail.m4
@@ -0,0 +1,52 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# 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.
+#
+
+ifdef(`PROCMAIL_PATH',,
+	`define(`PROCMAIL_PATH', /usr/local/bin/procmail)')
+ifdef(`PROCMAIL_MAILER_FLAGS',,
+	`define(`PROCMAIL_MAILER_FLAGS', `Shu')')
+ifdef(`PROCMAIL_MAILER_ARGS',,
+	`define(`PROCMAIL_MAILER_ARGS', `procmail -m $h $f $u')')
+
+POPDIVERT
+
+######################*****##############
+###   PROCMAIL Mailer specification   ###
+##################*****##################
+
+VERSIONID(`@(#)procmail.m4	8.4 (Berkeley) 4/23/95')
+
+Mprocmail,	P=PROCMAIL_PATH, F=CONCAT(`DFMm', PROCMAIL_MAILER_FLAGS), S=11/31, R=21/31, T=DNS/RFC822/X-Unix,
+		ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX, ')A=PROCMAIL_MAILER_ARGS
diff --git a/usr.sbin/sendmail/cf/mailer/smtp.m4 b/usr.sbin/sendmail/cf/mailer/smtp.m4
index 45efbd6..6b59574 100644
--- a/usr.sbin/sendmail/cf/mailer/smtp.m4
+++ b/usr.sbin/sendmail/cf/mailer/smtp.m4
@@ -32,60 +32,64 @@ PUSHDIVERT(-1)
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-ifdef(`SMTP_MAILER_FLAGS',,
-	`define(`SMTP_MAILER_FLAGS',
-		`ifdef(`_OLD_SENDMAIL_', `L', `')')')
+ifdef(`SMTP_MAILER_FLAGS',, `define(`SMTP_MAILER_FLAGS', `')')
+ifdef(`SMTP_MAILER_ARGS',, `define(`SMTP_MAILER_ARGS', `IPC $h')')
+ifdef(`ESMTP_MAILER_ARGS',, `define(`ESMTP_MAILER_ARGS', `IPC $h')')
+ifdef(`SMTP8_MAILER_ARGS',, `define(`SMTP8_MAILER_ARGS', `IPC $h')')
+ifdef(`RELAY_MAILER_ARGS',, `define(`RELAY_MAILER_ARGS', `IPC $h')')
+ifdef(`_MAILER_uucp_',
+	`errprint(`*** MAILER(smtp) must appear before MAILER(uucp)')')dnl
 POPDIVERT
 #####################################
 ###   SMTP Mailer specification   ###
 #####################################
 
-VERSIONID(`@(#)smtp.m4	8.15 (Berkeley) 2/14/94')
-
-Msmtp,		P=[IPC], F=CONCAT(mDFMuX, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), E=\r\n,
-		ifdef(`_OLD_SENDMAIL_',, `L=990, ')ifdef(`SMTP_MAILER_MAX', `M=SMTP_MAILER_MAX, ')A=IPC $h
-Mesmtp,		P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), E=\r\n,
-		ifdef(`_OLD_SENDMAIL_',, `L=990, ')ifdef(`SMTP_MAILER_MAX', `M=SMTP_MAILER_MAX, ')A=IPC $h
-Mrelay,		P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS), S=11/31, R=61, E=\r\n,
-		ifdef(`_OLD_SENDMAIL_',, `L=2040, ')A=IPC $h
+VERSIONID(`@(#)smtp.m4	8.32 (Berkeley) 11/20/95')
+
+Msmtp,		P=[IPC], F=CONCAT(mDFMuX, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990,
+		_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
+		A=SMTP_MAILER_ARGS
+Mesmtp,		P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990,
+		_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
+		A=ESMTP_MAILER_ARGS
+Msmtp8,		P=[IPC], F=CONCAT(mDFMuX8, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990,
+		_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
+		A=SMTP8_MAILER_ARGS
+Mrelay,		P=[IPC], F=CONCAT(mDFMuXa8, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `61/71', `61'), E=\r\n, L=2040,
+		_OPTINS(`RELAY_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
+		A=RELAY_MAILER_ARGS
 
 #
-#  envelope sender and masquerading recipient rewriting
+#  envelope sender rewriting
 #
 S11
 R$+			$: $>51 $1			sender/recipient common
-R$* :; <@>		$@ $1 :;			list:; special case
-R$*			$@ $>61 $1			qualify unqual'ed names
+R$* :; <@>		$@				list:; special case
+R$*			$: $>61 $1			qualify unqual'ed names
+R$+			$: $>94 $1			do masquerading
 
 
 #
-#  header recipient rewriting if not masquerading recipients
+#  envelope recipient rewriting --
+#  also header recipient if not masquerading recipients
 #
 S21
-
-# do sender/recipient common rewriting
-R$+			$: $>51 $1
-
-# unqualified names (e.g., "eric") are qualified by local host
-R$* < @ $* > $*		$@ $1 < @ $2 > $3		already qualified
-R$+			$: $1 < @ $j >			add local domain
+R$+			$: $>51 $1			sender/recipient common
+R$+			$: $>61 $1			qualify unqual'ed names
 
 
 #
-#  header sender and masquerading recipient rewriting
+#  header sender and masquerading header recipient rewriting
 #
 S31
 R$+			$: $>51 $1			sender/recipient common
-R$* :; <@>		$@ $1 :;			list:; special case
+R:; <@>			$@				list:; special case
 
 # do special header rewriting
 R$* <@> $*		$@ $1 <@> $2			pass null host through
 R< @ $* > $*		$@ < @ $1 > $2			pass route-addr through
-R$=E < @ $=w . >	$@ $1 < @ $2 >			exposed user as is
-R$* < @ $=w . >		$: $1 < @ $2 @ $M >		masquerade as domain
-R$* < @ $+ @ >		$@ $1 < @ $2 >			in case $M undefined
-R$* < @ $+ @ $+ >	$@ $1 < @ $3 >			$M is defined -- use it
-R$*			$@ $>61 $1			qualify unqual'ed names
+R$*			$: $>61 $1			qualify unqual'ed names
+R$+			$: $>93 $1			do masquerading
 
 
 #
@@ -110,9 +114,7 @@ R$+ < @ $* > $*		$@ $1 < @ $2 > $3		not UUCP form
 R< $&h ! > $- ! $+	$@ $2 < @ $1 .UUCP. >
 R< $&h ! > $-.$+ ! $+	$@ $3 < @ $1.$2 >
 R< $&h ! > $+		$@ $1 < @ $&h .UUCP. >
-R< $+ ! > $+		$: $1 ! $2 < @ $Y >
-R$+ < @ >		$: $1 < @ $j >			in case $Y undefined
-R$+ < @ $+ : $+ >	$: $1 < @ $3 >			strip mailer: part')
+R< $+ ! > $+		$: $1 ! $2 < @ *LOCAL* >')
 
 
 #
@@ -120,7 +122,14 @@ R$+ < @ $+ : $+ >	$: $1 < @ $3 >			strip mailer: part')
 #
 S61
 
-R$* < @ $* > $*		$@ $1 < @ $2 > $3		already qualified
-R$=E			$@ $1 < @ $j>			show exposed names
-R$+			$: $1 < @ $M >			user w/o host
-R$+ <@>			$: $1 < @ $j >			in case $M undefined
+R$* < @ $* > $*		$@ $1 < @ $2 > $3		already fully qualified
+R$+			$@ $1 < @ *LOCAL* >		add local qualification
+
+
+#
+#  relay mailer header masquerading recipient rewriting
+#
+S71
+
+R$+			$: $>61 $1
+R$+			$: $>93 $1
diff --git a/usr.sbin/sendmail/cf/mailer/usenet.m4 b/usr.sbin/sendmail/cf/mailer/usenet.m4
index fe6ee30..2abf3b0 100644
--- a/usr.sbin/sendmail/cf/mailer/usenet.m4
+++ b/usr.sbin/sendmail/cf/mailer/usenet.m4
@@ -41,7 +41,8 @@ POPDIVERT
 ###  USENET Mailer specification ###
 ####################################
 
-VERSIONID(`@(#)usenet.m4	8.3 (Berkeley) 1/24/94')
+VERSIONID(`@(#)usenet.m4	8.5 (Berkeley) 4/26/95')
 
-Musenet,	P=USENET_MAILER_PATH, F=USENET_MAILER_FLAGS, S=10, R=20,ifdef(`USENET_MAILER_MAX', ` M=USENET_MAILER_MAX,')
+Musenet,	P=USENET_MAILER_PATH, F=USENET_MAILER_FLAGS, S=10, R=20,
+		_OPTINS(`USENET_MAILER_MAX', `M=', `, ')T=X-Usenet/X-Usenet/X-Unix,
 		A=USENET_MAILER_ARGS $u
diff --git a/usr.sbin/sendmail/cf/mailer/uucp.m4 b/usr.sbin/sendmail/cf/mailer/uucp.m4
index dd7aa87..0b65949 100644
--- a/usr.sbin/sendmail/cf/mailer/uucp.m4
+++ b/usr.sbin/sendmail/cf/mailer/uucp.m4
@@ -34,15 +34,17 @@ PUSHDIVERT(-1)
 #
 
 ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')
-ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$f -gC $h!rmail ($u)')')
+ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$g -gC $h!rmail ($u)')')
 ifdef(`UUCP_MAILER_FLAGS',, `define(`UUCP_MAILER_FLAGS', `')')
-ifdef(`UUCP_MAX_SIZE',, `define(`UUCP_MAX_SIZE', 100000)')
+ifdef(`UUCP_MAILER_MAX',,
+	`define(`UUCP_MAILER_MAX',
+		`ifdef(`UUCP_MAX_SIZE', `UUCP_MAX_SIZE', 100000)')')
 POPDIVERT
 #####################################
 ###   UUCP Mailer specification   ###
 #####################################
 
-VERSIONID(`@(#)uucp.m4	8.16 (Berkeley) 4/14/94')
+VERSIONID(`@(#)uucp.m4	8.24 (Berkeley) 9/5/95')
 
 #
 #  There are innumerable variations on the UUCP mailer.  It really
@@ -50,24 +52,30 @@ VERSIONID(`@(#)uucp.m4	8.16 (Berkeley) 4/14/94')
 #
 
 # old UUCP mailer (two names)
-Muucp,		P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE,
+Muucp,		P=UUCP_MAILER_PATH, F=CONCAT(DFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX,
+		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
 		A=UUCP_MAILER_ARGS
-Muucp-old,	P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE,
+Muucp-old,	P=UUCP_MAILER_PATH, F=CONCAT(DFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX,
+		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
 		A=UUCP_MAILER_ARGS
 
 # smart UUCP mailer (handles multiple addresses) (two names)
-Msuucp,		P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE,
+Msuucp,		P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX,
+		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
 		A=UUCP_MAILER_ARGS
-Muucp-new,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE,
+Muucp-new,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX,
+		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
 		A=UUCP_MAILER_ARGS
 
 ifdef(`_MAILER_smtp_',
 `# domain-ized UUCP mailer
-Muucp-dom,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhu, UUCP_MAILER_FLAGS), S=52/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), M=UUCP_MAX_SIZE,
+Muucp-dom,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhud, UUCP_MAILER_FLAGS), S=52/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), M=UUCP_MAILER_MAX,
+		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
 		A=UUCP_MAILER_ARGS
 
 # domain-ized UUCP mailer with UUCP-style sender envelope
-Muucp-uudom,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhu, UUCP_MAILER_FLAGS), S=72/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), M=UUCP_MAX_SIZE,
+Muucp-uudom,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhud, UUCP_MAILER_FLAGS), S=72/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), M=UUCP_MAILER_MAX,
+		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
 		A=UUCP_MAILER_ARGS')
 
 
@@ -79,10 +87,10 @@ S12
 # handle error address as a special case
 R<@>				$n			errors to mailer-daemon
 
-# do not qualify list:; syntax
-R$* :; <@>			$@ $1 :;
+# list:; syntax should disappear
+R:; <@>				$@
 
-R$* < @ $* . >			$1 < @ $2 >		strip trailing dots
+R$* < @ $* . > $*		$1 < @ $2 > $3		strip trailing dots
 R$* < @ $=w >			$1			strip local name
 R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
 R<@ $+ > : $+			$1 ! $2			convert to UUCP format
@@ -98,10 +106,10 @@ R! $+				$: $k ! $1		in case $U undefined
 #
 S22
 
-# don't touch list:; syntax
-R$* :; <@>			$@ $1 :;
+# list:; should disappear
+R:; <@>				$@
 
-R$* < @ $* . >			$1 < @ $2 >		strip trailing dots
+R$* < @ $* . > $*		$1 < @ $2 > $3		strip trailing dots
 R$* < @ $j >			$1			strip local name
 R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
 R<@ $+ > : $+			$1 ! $2			convert to UUCP format
@@ -113,10 +121,10 @@ R$* < @ $+ >			$2 ! $1			convert to UUCP format
 #
 S42
 
-# don't touch list:; syntax
-R$* :; <@>			$@ $1 :;
+# list:; syntax should disappear
+R:; <@>				$@
 
-R$* < @ $* . >			$1 < @ $2 >		strip trailing dots
+R$* < @ $* . > $*		$1 < @ $2 > $3		strip trailing dots
 R$* < @ $j >			$1			strip local name
 R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
 R<@ $+ > : $+			$1 ! $2			convert to UUCP format
@@ -148,20 +156,14 @@ S72
 # handle error address as a special case
 R<@>				$n			errors to mailer-daemon
 
-# do not qualify list:; syntax
-R$* :; <@>			$@ $1 :;
+# do standard SMTP mailer rewriting
+R$*				$: $>11 $1
 
-R$* < @ $* . >			$1 < @ $2 >		strip trailing dots
-R$* < @ $=w >			$1			strip local name
-R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
-R<@ $+ > : $+			$1 ! $2			convert to UUCP format
-R$* < @ $- . UUCP >		$2 ! $1			convert to UUCP format
-R$* < @ $+ >			$@ $2 ! $1		convert to UUCP format
-
-R$&h ! $+ ! $+			$@ $1 ! $2		$h!...!user => ...!user
-R$&h ! $+			$@ $&h ! $1		$h!user => $h!user
-R$+				$: $M ! $1		prepend masquerade name
-R! $+				$: $j ! $1		in case $M undefined')
+R$* < @ $* . > $*		$1 < @ $2 > $3		strip trailing dots
+R<@ $- . UUCP > : $+		$@ $1 ! $2		convert to UUCP format
+R<@ $+ > : $+			$@ $1 ! $2		convert to UUCP format
+R$* < @ $- . UUCP >		$@ $2 ! $1		convert to UUCP format
+R$* < @ $+ >			$@ $2 ! $1		convert to UUCP format')
 
 
 PUSHDIVERT(4)