summaryrefslogtreecommitdiff
path: root/usr.sbin/sendmail/cf
diff options
context:
space:
mode:
authorglass <glass@NetBSD.org>1994-03-16 02:11:31 +0000
committerglass <glass@NetBSD.org>1994-03-16 02:11:31 +0000
commit3fb497653d34cde8706b0e446e52182df5bc4ae7 (patch)
tree378207336652cf6132b6412b0e6c3f105621d985 /usr.sbin/sendmail/cf
parentc0ae496079e5f8f6af13afb704a68b285f4d14b4 (diff)
sendmail 8.6.7. fixes recently discovered security hole
Diffstat (limited to 'usr.sbin/sendmail/cf')
-rw-r--r--usr.sbin/sendmail/cf/README73
-rw-r--r--usr.sbin/sendmail/cf/domain/Berkeley.m44
-rw-r--r--usr.sbin/sendmail/cf/feature/bitdomain.m46
-rw-r--r--usr.sbin/sendmail/cf/feature/uucpdomain.m46
-rw-r--r--usr.sbin/sendmail/cf/m4/proto.m465
-rw-r--r--usr.sbin/sendmail/cf/m4/version.m44
-rw-r--r--usr.sbin/sendmail/cf/mailer/smtp.m411
-rw-r--r--usr.sbin/sendmail/cf/mailer/uucp.m46
-rw-r--r--usr.sbin/sendmail/cf/ostype/irix.m44
-rw-r--r--usr.sbin/sendmail/cf/sh/makeinfo.sh6
10 files changed, 106 insertions, 79 deletions
diff --git a/usr.sbin/sendmail/cf/README b/usr.sbin/sendmail/cf/README
index b604d2453f5..189db52d1c0 100644
--- a/usr.sbin/sendmail/cf/README
+++ b/usr.sbin/sendmail/cf/README
@@ -4,7 +4,7 @@
Eric Allman <eric@CS.Berkeley.EDU>
- @(#)README 8.21 (Berkeley) 1/12/94
+ @(#)README 8.27 (Berkeley) 3/12/94
This document describes the sendmail configuration files being used
@@ -13,7 +13,7 @@ there is an ``OLDSENDMAIL'' mode, they haven't really been tested on
old versions of sendmail and cannot be expected to work well.
These configuration files are probably not as general as previous
-versions, and don't handle as many of the wierd cases automagically.
+versions, and don't handle as many of the weird cases automagically.
I was able to simplify by them for two reasons. First, the network
has become more consistent -- for example, at this point, everyone
on the internet is supposed to be running a name server, so hacks to
@@ -23,8 +23,8 @@ a long-haul protocol. I realize that this is not universal, but it
does describe the vast majority of sites with which I am familiar,
including those outside the US.
-Of course, the downside of this is that if you do live in a wierd
-world, things are going to get wierder for you. I'm sorry about that,
+Of course, the downside of this is that if you do live in a weird
+world, things are going to get weirder for you. I'm sorry about that,
but at the time we at Berkeley had a problem, and it seemed like the
right thing to do.
@@ -163,8 +163,12 @@ USENET_MAILER_PATH [/usr/lib/news/inews] The name of the program
USENET_MAILER_FLAGS [rlsDFMmn] The mailer flags for the usenet mailer.
USENET_MAILER_ARGS [-m -h -n] The command line arguments for the
usenet mailer.
+USENET_MAILER_MAX [100000] The maximum size of messages that will
+ be accepted by the usenet mailer.
SMTP_MAILER_FLAGS [undefined] Flags added to SMTP mailer. Default
flags are `mDFMUX' (and `a' for esmtp mailer).
+SMTP_MAILER_MAX [undefined] The maximum size of messages that will
+ be transported using the smtp or esmtp mailers.
UUCP_MAILER_FLAGS [undefined] Flags added to UUCP mailer. Default
flags are `DFMhuU' (and `m' for suucp mailer, minus
`U' for uucp-dom mailer).
@@ -172,11 +176,10 @@ UUCP_MAILER_ARGS [uux - -r -z -a$f -gC $h!rmail ($u)] The arguments
passed to the UUCP mailer.
UUCP_MAX_SIZE [100000] The maximum size message accepted for
transmission by the UUCP mailers.
-HOSTMAP_SPEC [dbm -o /etc/hostmap] The value for the builtin
- hostmap key definition. You can redefine this
- to change the class, flags, and filename of
- the hostmap. The default flag (-o) makes this
- map optional.
+FAX_MAILER_PATH [/usr/local/lib/fax/mailfax] The program used to
+ submit FAX messages.
+FAX_MAILER_MAX [100000] The maximum size message accepted for
+ transmission by FAX.
+---------+
| DOMAINS |
@@ -410,6 +413,20 @@ Complex sites will need more local configuration information, such as
lists of UUCP hosts they speak with directly. This can get a bit more
tricky. For an example of a "complex" site, see cf/ucbvax.mc.
+If your host is known by several different names, you need to augment
+the $=w class. This is a list of names by which you are known, and
+anything sent to an address using a host name in this list will be
+treated as local mail. You can do this in two ways: either create
+the file /etc/sendmail.cw containing a list of your aliases (one per
+line), and use ``FEATURE(use_cw_file)'' in the .mc file, or add the
+line:
+
+ Cw alias.host.name
+
+at the end of that file. See the ``vangogh.mc'' file for an example.
+Be sure you use the fully-qualified name of the host, rather than a
+short name.
+
The SITECONFIG macro allows you to indirectly reference site-dependent
configuration information stored in the siteconfig subdirectory. For
example, the line
@@ -418,18 +435,26 @@ example, the line
reads the file uucp.ucbvax for local connection information. The
second parameter is the local name (in this case just "ucbvax" since
-it is locally connected, and hence a UUCP hostname) and the name of
-the class in which to store the host information. Another SITECONFIG
-line reads
+it is locally connected, and hence a UUCP hostname). The third
+parameter is the name of both a macro to store the local name (in
+this case, $U) and the name of the class (e.g., $=U) in which to store
+the host information read from the file. Another SITECONFIG line reads
SITECONFIG(uucp.ucbarpa, ucbarpa.Berkeley.EDU, W)
This says that the file uucp.ucbarpa contains the list of UUCP sites
connected to ucbarpa.Berkeley.EDU. The $=W class will be used to
-store this list. [The machine ucbarpa is gone now, but I've left
+store this list, and $W is defined to be ucbarpa.Berkeley.EDU, that
+is, the name of the relay to which the hosts listed in uucp.ucbarpa
+are connected. [The machine ucbarpa is gone now, but I've left
this out-of-date configuration file around to demonstrate how you
might do this.]
+Note that the case of SITECONFIG with a third parameter of ``U'' is
+special; the second parameter is assumed to be the UUCP name of the
+local site, rather than the name of a remote site, and the UUCP name
+is entered into $=w (the list of local hostnames) as $U.UUCP.
+
The siteconfig file (e.g., siteconfig/uucp.ucbvax.m4) contains nothing
more than a sequence of SITE macros describing connectivity. For
example:
@@ -547,7 +572,7 @@ will cause addresses of the form "decvax!user" and "research!user"
to be converted to "user@decvax.dec.com" and "user@research.att.com"
respectively.
-This could also be used to look hosts in a database map:
+This could also be used to look up hosts in a database map:
LOCAL_RULE_3
R$* < @ $+ > $* $: $1 < @ $(hostmap $2 $) > $3
@@ -559,7 +584,7 @@ For example, new rules are needed to parse hostnames that you accept
via MX records. For example, you might have:
LOCAL_RULE_0
- R$+ < @ cnmat.Berkeley.EDU > $#uucp $@ cnmat $: $1
+ R$+ <@ host.dom.ain.> $#uucp $@ cnmat $: $1 < @ host.dom.ain.>
You would use this if you had installed an MX record for cnmat.Berkeley.EDU
pointing at this host; this rule catches the message and forwards it on
@@ -585,9 +610,9 @@ You can have your host masquerade as another using
MASQUERADE_AS(host.domain)
-This causes outgoing SMTP mail to be labelled as coming from the
+This causes outgoing SMTP mail to be labeled as coming from the
indicated domain, rather than $j. One normally masquerades as one
-of your own subdomains (for example, it's unlikely that I would
+of one's own subdomains (for example, it's unlikely that I would
choose to masquerade as an MIT site).
The masquerade name is not normally canonified, so it is important
@@ -628,9 +653,11 @@ shared /var/spool/mail scheme, use
define(`MAIL_HUB', mailer:hostname)
Again, ``mailer:'' defaults to "smtp". If you define both LOCAL_RELAY
-and MAIL_HUB, unqualified names and names in class L will be sent to
-the LOCAL_RELAY and other local names will be sent to MAIL_HUB. For
-example, if are on machine mastodon.CS.Berkeley.EDU, the following
+and MAIL_HUB, unqualified names will be sent to the LOCAL_RELAY and
+other local names will be sent to MAIL_HUB. Names in $=L will be
+delivered locally, so you MUST have aliases or .forward files for them.
+
+For example, if are on machine mastodon.CS.Berkeley.EDU, the following
combinations of settings will have the indicated effects:
email sent to.... eric eric@mastodon.CS.Berkeley.EDU
@@ -786,7 +813,7 @@ Sam Leffler's FlexFAX software is still in beta test -- but he expects a
public version out "later this week" [as of 3/1/93]. The following
blurb is direct from Sam:
- $Header: /cvsroot/src/usr.sbin/sendmail/cf/Attic/README,v 1.7 1994/01/31 02:38:21 glass Exp $
+ $Header: /cvsroot/src/usr.sbin/sendmail/cf/Attic/README,v 1.8 1994/03/16 02:11:48 glass Exp $
How To Obtain This Software (in case all you get is this file)
--------------------------------------------------------------
@@ -1081,7 +1108,7 @@ feature These hold special orthogonal features that you might
hack Local hacks. These can be referenced using the HACK
macro. They shouldn't be of more than voyeuristic
interest outside the .Berkeley.EDU domain, but who knows?
- We've all got our own peccadilloes.
+ We've all got our own peccadillos.
siteconfig Site configuration -- e.g., tables of locally connected
UUCP sites.
@@ -1197,5 +1224,5 @@ M4 DIVERSIONS
5 locally interpreted names (overrides $R)
6 local configuration (at top of file)
7 mailer definitions
- 8 special local name recognition (late in ruleset 3)
+ 8
9 special local rulesets (1 and 2)
diff --git a/usr.sbin/sendmail/cf/domain/Berkeley.m4 b/usr.sbin/sendmail/cf/domain/Berkeley.m4
index c3320e00f0a..4f572d6436a 100644
--- a/usr.sbin/sendmail/cf/domain/Berkeley.m4
+++ b/usr.sbin/sendmail/cf/domain/Berkeley.m4
@@ -33,9 +33,9 @@ divert(-1)
# SUCH DAMAGE.
#
divert(0)
-VERSIONID(`@(#)Berkeley.m4 8.4 (Berkeley) 12/20/93')
+VERSIONID(`@(#)Berkeley.m4 8.5 (Berkeley) 2/18/94')
define(`UUCP_RELAY', `ucbvax.Berkeley.EDU')dnl
-define(`BITNET_RELAY', `jade.Berkeley.EDU')dnl
+define(`BITNET_RELAY', `CMSA.Berkeley.EDU')dnl
define(`confFORWARD_PATH', `$z/.forward.$w:$z/.forward')dnl
define(`confCW_FILE', `-o /etc/sendmail.cw')dnl
FEATURE(redirect)dnl
diff --git a/usr.sbin/sendmail/cf/feature/bitdomain.m4 b/usr.sbin/sendmail/cf/feature/bitdomain.m4
index d90bb106346..85c8cf0017f 100644
--- a/usr.sbin/sendmail/cf/feature/bitdomain.m4
+++ b/usr.sbin/sendmail/cf/feature/bitdomain.m4
@@ -34,7 +34,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)bitdomain.m4 8.4 (Berkeley) 11/30/93')
+VERSIONID(`@(#)bitdomain.m4 8.6 (Berkeley) 2/19/94')
divert(-1)
@@ -43,7 +43,7 @@ Kbitdomain ifelse(_ARG_, `', `hash -o /etc/bitdomain', `_ARG_')
POPDIVERT
-PUSHDIVERT(8)
+PUSHDIVERT(2)
# handle BITNET mapping
-R$* < @ $+ .BITNET. > $* $: $1 < @ $(bitdomain $2 $: $2.BITNET. $) > $3
+R$* < @ $+ .BITNET > $* $: $1 < @ $(bitdomain $2 $: $2.BITNET $) > $3
POPDIVERT
diff --git a/usr.sbin/sendmail/cf/feature/uucpdomain.m4 b/usr.sbin/sendmail/cf/feature/uucpdomain.m4
index 931a3150444..77cc97bbe4a 100644
--- a/usr.sbin/sendmail/cf/feature/uucpdomain.m4
+++ b/usr.sbin/sendmail/cf/feature/uucpdomain.m4
@@ -34,7 +34,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)uucpdomain.m4 8.4 (Berkeley) 11/30/93')
+VERSIONID(`@(#)uucpdomain.m4 8.6 (Berkeley) 2/19/94')
divert(-1)
@@ -43,7 +43,7 @@ Kuudomain ifelse(_ARG_, `', `hash -o /etc/uudomain', `_ARG_')
POPDIVERT
-PUSHDIVERT(8)
+PUSHDIVERT(2)
# handle UUCP mapping
-R$* < @ $+ .UUCP. > $* $: $1 < @ $(uudomain $2 $: $2.UUCP. $) > $3
+R$* < @ $+ .UUCP > $* $: $1 < @ $(uudomain $2 $: $2.UUCP $) > $3
POPDIVERT
diff --git a/usr.sbin/sendmail/cf/m4/proto.m4 b/usr.sbin/sendmail/cf/m4/proto.m4
index 410e32b7031..284572988f9 100644
--- a/usr.sbin/sendmail/cf/m4/proto.m4
+++ b/usr.sbin/sendmail/cf/m4/proto.m4
@@ -34,7 +34,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)proto.m4 8.30 (Berkeley) 1/12/94')
+VERSIONID(`@(#)proto.m4 8.45 (Berkeley) 3/4/94')
MAILER(local)dnl
@@ -118,12 +118,12 @@ DR`'ifdef(`LOCAL_RELAY', LOCAL_RELAY)
# who gets all local email traffic ($R has precedence for unqualified names)
DH`'ifdef(`MAIL_HUB', MAIL_HUB)
-# who I masquerade as (can be $j)
-DM`'ifdef(`MASQUERADE_NAME', MASQUERADE_NAME, $j)
+# who I masquerade as (null for no masquerading)
+DM`'ifdef(`MASQUERADE_NAME', MASQUERADE_NAME)
# class L: names that should be delivered locally, even if we have a relay
# class E: names that should be exposed as from this host, even if we masquerade
-CLroot
+#CLroot
CEroot
undivert(5)dnl
@@ -171,7 +171,7 @@ O7`'confSEVEN_BIT_INPUT
Oa`'confALIAS_WAIT
# location of alias file
-OA`'ifdef(`ALIAS_FILE', ALIAS_FILE, /etc/aliases)
+OA`'ifdef(`ALIAS_FILE', `ALIAS_FILE', /etc/aliases)
# minimum number of free blocks on filesystem
Ob`'confMIN_FREE_BLOCKS
@@ -360,7 +360,7 @@ Tuucp
#########################
H?P?Return-Path: $g
-HReceived: $?sfrom $s $.$?_($_) $.by $j ($v/$Z)$?r with $r$. id $i$?u for $u$.; $b
+HReceived: $?sfrom $s $.$?_($?s$|from $.$_) $.by $j ($v/$Z)$?r with $r$. id $i$?u for $u$.; $b
H?D?Resent-Date: $a
H?D?Date: $a
H?F?Resent-From: $q
@@ -443,9 +443,9 @@ R$* < @ localhost > $* $: $1 < @ $j . > $2 no domain at all
R$* < @ localhost . $m > $* $: $1 < @ $j . > $2 local domain
ifdef(`_NO_UUCP_', `dnl',
`R$* < @ localhost . UUCP > $* $: $1 < @ $j . > $2 .UUCP domain')
-R$* < @ [ $+ ] > $* $: $1 < @ [[ $2 ]] > $3 catch [a.b.c.d]
-R$* < @ [ $=w ] > $* $: $1 < @ $j . > $3 self-literal
-R$* < @ [[ $+ ]] > $* $: $1 < @ [ $2 ] > $3 strip dbl [[]]
+R$* < @ [ $+ ] > $* $: $1 < @@ [ $2 ] > $3 mark [a.b.c.d]
+R$* < @@ $=w > $* $: $1 < @ $j . > $3 self-literal
+R$* < @@ $+ > $* $@ $1 < @ $2 > $3 canon IP addr
ifdef(`DOMAIN_TABLE', `
# look up unqualified domains in the domain table
R$* < @ $- > $* $: $1 < @ $(domaintable $2 $) > $3',
@@ -483,8 +483,6 @@ R$* < @ $=w > $* $: $1 < @ $2 . > $3
R$* < @ $* $=P > $* $: $1 < @ $2 $3 . > $4
R$* < @ $* . . > $* $1 < @ $2 . > $3
-undivert(8)dnl
-
# if this is the local hostname, make sure we treat is as canonical
R$* < @ $j > $* $: $1 < @ $j . > $2
@@ -496,9 +494,6 @@ S4
R$*<@> $@ $1 handle <> and list:;
-# resolve numeric addresses to name if possible
-R$* < @ [ $+ ] > $* $: $1 < @ $[ [$2] $] > $3 lookup numeric internet addr
-
# strip trailing dot off possibly canonical name
R$* < @ $+ . > $* $1 < @ $2 > $3
@@ -533,13 +528,12 @@ R$* $@ $>0 $1
S0
R<@> $#_LOCAL_ $: <> special case error msgs
-R$*:;<@> $#error $@ USAGE $: "list:; syntax illegal for recipient addresses"
+R$* : $* ; $#error $@ USAGE $: "list:; syntax illegal for recipient addresses"
R<@ $+> $#error $@ USAGE $: "user address required"
+R<$* : $* > $#error $@ USAGE $: "colon illegal in host name part"
ifdef(`_MAILER_smtp_',
`# handle numeric address spec
-ifdef(`_NO_CANONIFY_', `dnl',
-`R$* < @ [ $+ ] > $* $: $1 < @ $[ [$2] $] > $3 numeric internet addr')
R$* < @ [ $+ ] > $* $: $>_SET_98_ $1 < @ [ $2 ] > $3 numeric internet spec
R$* < @ [ $+ ] > $* $#_SMTP_ $@ [$2] $: $1 < @ [$2] > $3 still numeric: send',
`dnl')
@@ -551,15 +545,6 @@ R$* $=O $* < @ $=w . > $@ $>_SET_97_ $1 $2 $3 ...@here -> ...
# handle local hacks
R$* $: $>_SET_98_ $1
-ifdef(`MAILER_TABLE',
-`
-# try mailer table lookup
-R$* <@ $+ > $* $: < $2 > $1 < @ $2 > $3 extract host name
-R< $+ . > $* $: < $1 > $2 strip trailing dot
-R< $+ > $* $: < $(mailertable $1 $) > $2 lookup
-R< $- : $+ > $* $# $1 $@ $2 $: $3 check -- resolved?
-R< $+ > $* $: $>90 <$1> $2 try domain',
-`dnl')
# short circuit local delivery so forwarded email works
ifdef(`_LOCAL_NOT_STICKY_',
@@ -572,6 +557,15 @@ R$+ < $+ @ $+ > $#relay $@ $3 $: $1 < $2 > yep ....
R$+ < $+ @ > $#_LOCAL_ $: $1 nope, local address',
`R$+ < $+ @ $+ > $#_LOCAL_ $: $1 yep ....
R$+ < $+ @ > $#_LOCAL_ $: @ $1 nope, local address')')
+ifdef(`MAILER_TABLE',
+`
+# not local -- try mailer table lookup
+R$* <@ $+ > $* $: < $2 > $1 < @ $2 > $3 extract host name
+R< $+ . > $* $: < $1 > $2 strip trailing dot
+R< $+ > $* $: < $(mailertable $1 $) > $2 lookup
+R< $- : $+ > $* $# $1 $@ $2 $: $3 check -- resolved?
+R< $+ > $* $: $>90 <$1> $2 try domain',
+`dnl')
undivert(4)dnl
ifdef(`_NO_UUCP_', `dnl',
@@ -608,7 +602,7 @@ R$* < @ $+ .UUCP. > $* $#uucp $@ $2 $: $1 < @ $2 .UUCP. > $3 user@host.UUCP',
`dnl')')
ifdef(`_MAILER_usenet_', `
# addresses sent to net.group.USENET will get forwarded to a newsgroup
-R$+ . USENET. $#usenet $: $1',
+R$+ . USENET $#usenet $: $1',
`dnl')
ifdef(`_LOCAL_RULES_',
@@ -646,8 +640,11 @@ R$+ $#_LOCAL_ $: $1 regular local names
S5
# see if we have a relay or a hub
-R$+ $: $>_SET_95_ < $R > $1 try relay
-R$+ $: $>_SET_95_ < $H > $1 try hub')
+R$+ $: < $R > $1 try relay
+R< > $+ $: < $H > $1 try hub
+R< > $+ $@ $1 nope, give up
+R< $- : $+ > $+ $: $>_SET_95_ < $1 : $2 > $3 < @ $2 >
+R< $+ > $+ $@ $>_SET_95_ < $1 > $2 < @ $1 >')
ifdef(`MAILER_TABLE',
`
@@ -657,10 +654,12 @@ ifdef(`MAILER_TABLE',
###################################################################
S90
-R<$- . $+ > $* $: < $(mailertable .$2 $@ $1 $) > $3 lookup
-R<$- : $+ > $* $# $1 $@ $2 $: $3 check -- resolved?
-R< . $+ > $* $@ $>90 <$1> $2 no -- strip & try again
-R<$*> $* $@ $2 no match',
+R$* <$- . $+ > $* $: $1$2 < $(mailertable .$3 $@ $1$2 $@ $2 $) > $4
+R$* <$- : $+ > $* $# $2 $@ $3 $: $4 check -- resolved?
+R$* < . $+ > $* $@ $>90 $1 . <$2> $3 no -- strip & try again
+R$* < $* > $* $: < $(mailertable . $@ $1$2 $) > $3 try "."
+R<$- : $+ > $* $# $1 $@ $2 $: $3 "." found?
+R< $* > $* $@ $2 no mailertable match',
`dnl')
###################################################################
diff --git a/usr.sbin/sendmail/cf/m4/version.m4 b/usr.sbin/sendmail/cf/m4/version.m4
index d92f73f9dfd..d71e816810f 100644
--- a/usr.sbin/sendmail/cf/m4/version.m4
+++ b/usr.sbin/sendmail/cf/m4/version.m4
@@ -32,8 +32,8 @@ divert(-1)
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-VERSIONID(`@(#)version.m4 8.6.1.5 (Berkeley) 1/13/94')
+VERSIONID(`@(#)version.m4 8.6.6.1 (Berkeley) 3/13/94')
#
divert(0)
# Configuration version number
-DZ8.6.5
+DZ8.6.6
diff --git a/usr.sbin/sendmail/cf/mailer/smtp.m4 b/usr.sbin/sendmail/cf/mailer/smtp.m4
index 9b28f63e298..45efbd68a81 100644
--- a/usr.sbin/sendmail/cf/mailer/smtp.m4
+++ b/usr.sbin/sendmail/cf/mailer/smtp.m4
@@ -40,12 +40,12 @@ POPDIVERT
### SMTP Mailer specification ###
#####################################
-VERSIONID(`@(#)smtp.m4 8.13 (Berkeley) 12/27/93')
+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, ')A=IPC $h
+ 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, ')A=IPC $h
+ 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
@@ -82,8 +82,9 @@ R$* :; <@> $@ $1 :; list:; special case
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 < @ $M > masquerade as domain
-R$* < @ > $: $1 < @ $j > in case $M undefined
+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
diff --git a/usr.sbin/sendmail/cf/mailer/uucp.m4 b/usr.sbin/sendmail/cf/mailer/uucp.m4
index c4b5e8e0f9e..517839f1613 100644
--- a/usr.sbin/sendmail/cf/mailer/uucp.m4
+++ b/usr.sbin/sendmail/cf/mailer/uucp.m4
@@ -34,7 +34,7 @@ PUSHDIVERT(-1)
#
ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')
-ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$f -gC $h!rmail ($u)')')
+ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$f -gC $h!rmail ($u)')')
ifdef(`UUCP_MAILER_FLAGS',, `define(`UUCP_MAILER_FLAGS', `')')
ifdef(`UUCP_MAX_SIZE',, `define(`UUCP_MAX_SIZE', 100000)')
POPDIVERT
@@ -42,7 +42,7 @@ POPDIVERT
### UUCP Mailer specification ###
#####################################
-VERSIONID(`@(#)uucp.m4 8.13 (Berkeley) 1/10/94')
+VERSIONID(`@(#)uucp.m4 8.15 (Berkeley) 2/16/94')
#
# There are innumerable variations on the UUCP mailer. It really
@@ -151,7 +151,7 @@ R! $+ $: $j ! $1 in case $M undefined')
PUSHDIVERT(4)
# resolve locally connected UUCP links
-R$* < @ $=Z . UUCP. > $* $#uucp-uudom $@ $1 $: $1 < @ $2 .UUCP. > $3 @host.UUCP: ...
+R$* < @ $=Z . UUCP. > $* $#uucp-uudom $@ $2 $: $1 < @ $2 .UUCP. > $3
R$* < @ $=Y . UUCP. > $* $#uucp-new $@ $2 $: $1 < @ $2 .UUCP. > $3
R$* < @ $=U . UUCP. > $* $#uucp-old $@ $2 $: $1 < @ $2 .UUCP. > $3
POPDIVERT
diff --git a/usr.sbin/sendmail/cf/ostype/irix.m4 b/usr.sbin/sendmail/cf/ostype/irix.m4
index 752c04d7aa8..6cd7fc9a959 100644
--- a/usr.sbin/sendmail/cf/ostype/irix.m4
+++ b/usr.sbin/sendmail/cf/ostype/irix.m4
@@ -34,8 +34,8 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)irix.m4 8.3 (Berkeley) 11/27/93')
-define(`LOCAL_MAILER_FLAGS', Ehmu)dnl
+VERSIONID(`@(#)irix.m4 8.4 (Berkeley) 2/1/94')
+define(`LOCAL_MAILER_FLAGS', Ehm)dnl
define(`QUEUE_DIR', /usr/spool/mqueue)dnl
define(`ALIAS_FILE', /usr/lib/aliases)dnl
define(`STATUS_FILE', /usr/lib/sendmail.st)dnl
diff --git a/usr.sbin/sendmail/cf/sh/makeinfo.sh b/usr.sbin/sendmail/cf/sh/makeinfo.sh
index 216cf615a37..dd5044afe97 100644
--- a/usr.sbin/sendmail/cf/sh/makeinfo.sh
+++ b/usr.sbin/sendmail/cf/sh/makeinfo.sh
@@ -32,7 +32,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# @(#)makeinfo.sh 8.3 (Berkeley) 7/23/93
+# @(#)makeinfo.sh 8.4 (Berkeley) 3/4/94
#
usewhoami=0
@@ -73,5 +73,5 @@ then
else
host=`uname -n`
fi
-echo '#####' built by $user on `date`
-echo '#####' in `pwd` on $host
+echo '#####' built by $user@$host on `date`
+echo '#####' in `pwd` | sed 's/\/tmp_mnt//'