update to sendmail 8.12.3

11 files changed, 161 insertions, 70 deletions

diff --git a/gnu/usr.sbin/sendmail/cf/README b/gnu/usr.sbin/sendmail/cf/README
index 7ed6d7859be..62c9bae1873 100644
--- a/gnu/usr.sbin/sendmail/cf/README
+++ b/gnu/usr.sbin/sendmail/cf/README
@@ -367,6 +367,9 @@ SMTP_MAILER_MAX		[undefined] The maximum size of messages that will
 SMTP_MAILER_MAXMSGS	[undefined] If defined, the maximum number of
 			messages to deliver in a single connection for the
 			smtp, smtp8, esmtp, or dsmtp mailers.
+SMTP_MAILER_MAXRCPTS	[undefined] If defined, the maximum number of
+			recipients to deliver in a single connection for the
+			smtp, smtp8, esmtp, or dsmtp mailers.
 SMTP_MAILER_ARGS	[TCP $h] The arguments passed to the smtp mailer.
 			About the only reason you would want to change this
 			would be to change the default port.
@@ -1084,6 +1087,9 @@ relay_entire_domain
 		By default, only hosts listed as RELAY in the access db
 		will be allowed to relay.  This option also allows any
 		host in your domain as defined by class {m}.
+		Notice: make sure that your domain is not just a top level
+		domain, e.g., com.  This can happen if you give your
+		host a name like example.com instead of host.example.com.
 
 relay_hosts_only
 		By default, names that are listed as RELAY in the access
@@ -1274,11 +1280,13 @@ no_default_msa	Don't generate the default MSA daemon, i.e.,
 		FEATURE and introduce new settings via DAEMON_OPTIONS().
 
 msp		Defines config file for Message Submission Program.
-		See sendmail/SECURITY for details and cf/cf/submit.mc
-		how to use it.  An optional argument can be used to
-		override the default of `localhost' to use as host to send
-		all e-mails to.  If `MSA' is specified as second argument
-		then port 587 is used to contact the server.  Example:
+		See sendmail/SECURITY for details and cf/cf/submit.mc how
+		to use it.  An optional argument can be used to override
+		the default of `[localhost]' to use as host to send all
+		e-mails to.  Note that MX records will be used if the
+		specified hostname is not in square brackets (e.g.,
+		[hostname]).  If `MSA' is specified as second argument then
+		port 587 is used to contact the server.  Example:
 
 			FEATURE(`msp', `', `MSA')
 
@@ -1298,6 +1306,9 @@ queuegroup	A simple example how to select a queue group based
 		queue groups.  If an argument is specified, it is used
 		as default queue group.
 
+		Note: please read the warning in doc/op/op.me about
+		queue groups and possible queue manipulations.
+
 +-------+
 | HACKS |
 +-------+
@@ -1744,7 +1755,7 @@ CAUTION: aliases are additive so that entries like these:
 	sendmailMTAKey: bob
 	sendmailMTAAliasValue: eric
 
-	dn: sendmailMTAKey=bob, dc=sendmail, dc=org
+	dn: sendmailMTAKey=bobetrn, dc=sendmail, dc=org
 	objectClass: sendmailMTA
 	objectClass: sendmailMTAAlias
 	objectClass: sendmailMTAAliasObject
@@ -1973,19 +1984,21 @@ found, the +detail information is copied to the new address.
 
 The default <mailHost> map definition is:
 
-	ldap -1 -v mailHost -k (&(objectClass=inetLocalMailRecipient)
+	ldap -1 -T<TMPF> -v mailHost -k (&(objectClass=inetLocalMailRecipient)
 				 (mailLocalAddress=%0))
 
 The default <mailRoutingAddress> map definition is:
 
-	ldap -1 -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)
-					   (mailLocalAddress=%0))
+	ldap -1 -T<TMPF> -v mailRoutingAddress
+			 -k (&(objectClass=inetLocalMailRecipient)
+			      (mailLocalAddress=%0))
 
 Note that neither includes the LDAP server hostname (-h server) or base DN
 (-b o=org,c=COUNTRY), both necessary for LDAP queries.  It is presumed that
 your .mc file contains a setting for the confLDAP_DEFAULT_SPEC option with
 these settings.  If this is not the case, the map definitions should be
-changed as described above.
+changed as described above.  The "-T<TMPF>" is required in any user
+specified map definition to catch temporary errors.
 
 The following possibilities exist as a result of an LDAP lookup on an
 address:
@@ -2242,14 +2255,16 @@ For example,
 
 	spammer@aol.com			REJECT
 	cyberspammer.com		REJECT
+	TLD				REJECT
 	192.168.212			REJECT
 	IPv6:2002:c0a8:02c7		RELAY
 	IPv6:2002:c0a8:51d2::23f4	REJECT
 
 would refuse mail from spammer@aol.com, any user from cyberspammer.com
-(or any host within the cyberspammer.com domain), any host on the
-192.168.212.* network, and the IPv6 address 2002:c0a8:51d2::23f4.  It would
-allow relay for the IPv6 network 2002:c0a8:02c7::/48.
+(or any host within the cyberspammer.com domain), any host in the entire
+top level domain TLD, 192.168.212.* network, and the IPv6 address
+2002:c0a8:51d2::23f4.  It would allow relay for the IPv6 network
+2002:c0a8:02c7::/48.
 
 The value part of the map can contain:
 
@@ -2505,11 +2520,15 @@ FEATURE(`delay_checks') can take an optional argument:
 	FEATURE(`delay_checks', `hater')
 		 enables spamhater test
 
-If such an argument is given, the recipient will be looked up in the access
-map (using the tag Spam:).  If the argument is `friend', then the other
-rulesets will be skipped if the recipient address is found and has RHS
-friend.  If the argument is `hater', then the other rulesets will be
-applied if the recipient address is found and has RHS hater.
+If such an argument is given, the recipient will be looked up in the
+access map (using the tag Spam:).  If the argument is `friend', then
+the default behavior is to apply the other rulesets and make a SPAM
+friend the exception.  The rulesets check_mail and check_relay will be
+skipped only if the recipient address is found and has RHS FRIEND.  If
+the argument is `hater', then the default behavior is to skip the rulesets
+check_mail and check_relay and make a SPAM hater the exception.  The
+other two rulesets will be applied only if the recipient address is
+found and has RHS HATER.
 
 This allows for simple exceptions from the tests, e.g., by activating
 the friend option and having
@@ -3022,8 +3041,8 @@ For example:
 	LOCAL_NET_CONFIG
 	R$* < @ $* .$m. > $*	$#smtp $@ $2.$m. $: $1 < @ $2.$m. > $3
 
-This will cause all names that end in your domain name ($m) via
-SMTP; anything else will be sent via uucp-new (smart UUCP) to uunet.
+This will cause all names that end in your domain name ($m) to be sent
+via SMTP; anything else will be sent via uucp-new (smart UUCP) to uunet.
 If you have FEATURE(`nocanonify'), you may need to omit the dots after
 the $m.  If you are running a local DNS inside your domain which is
 not otherwise connected to the outside world, you probably want to
@@ -3998,7 +4017,9 @@ Notice: do not add options/features to submit.mc unless you are
 absolutely sure you need them.  Options you may want to change
 include:
 
-- confTIME_ZONE on OS that don't use the default, e.g., Irix.
+- confTRUSTED_USERS, FEATURE(`use_ct_file'), and confCT_FILE for
+  avoiding X-Authorization warnings.
+- confTIME_ZONE to change it from the default `USE_TZ'.
 - confDELIVERY_MODE is set to interactive in msp.m4 instead
   of the default background mode.
 
@@ -4237,4 +4258,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 1.11 $, Last updated $Date: 2002/01/14 03:21:39 $
+$Revision: 1.12 $, Last updated $Date: 2002/04/18 00:49:26 $
diff --git a/gnu/usr.sbin/sendmail/cf/cf/README b/gnu/usr.sbin/sendmail/cf/cf/README
index f3543bfcb09..d0ac86559d6 100644
--- a/gnu/usr.sbin/sendmail/cf/cf/README
+++ b/gnu/usr.sbin/sendmail/cf/cf/README
@@ -5,8 +5,8 @@ This document describes how to install the sendmail configuration files.
 Please see ../README about the sendmail configuration files themselves.
 
 By default you need two .mc files: sendmail.mc and submit.mc.  The
-latter is a copy of msp.mc in which OSTYPE() has been filled in
-according to the host OS.  For the former see ../README.
+latter is an OS independent configuration file for the mail submission
+program (MSP).  See ../README for details about both files.
 
 Installation of these two files can be done via:
 
@@ -31,4 +31,4 @@ The name of the source file for "submit.cf" can be overridden by
 For more details see Makefile.
 
 
-$Revision: 1.1 $, Last updated $Date: 2001/04/26 15:43:20 $
+$Revision: 1.2 $, Last updated $Date: 2002/02/22 00:33:54 $
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
index 332e8067ff2..2dd25c4cc14 100644
--- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
@@ -6,7 +6,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.11 2002/01/14 03:21:39 millert Exp $')
+VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.12 2002/04/18 00:49:26 millert Exp $')
 OSTYPE(openbsd)dnl
 dnl
 dnl Advertise ourselves as ``openbsd.org''
@@ -21,8 +21,8 @@ dnl Override some default values
 define(`confPRIVACY_FLAGS', `authwarnings, nobodyreturn')dnl
 define(`confTRY_NULL_MX_LIST', `True')dnl
 define(`confMAX_HOP', `30')dnl
-define(`confQUEUE_LA', `12')dnl
-define(`confREFUSE_LA', `20')dnl
+define(`confQUEUE_LA', `6')dnl
+define(`confREFUSE_LA', `100')dnl
 dnl
 dnl Some broken nameservers will return SERVFAIL (a temporary failure)
 dnl on T_AAAA (IPv6) lookups.
@@ -32,6 +32,13 @@ dnl Keep host status on disk between sendmail runs in the .hoststat dir
 define(`confHOST_STATUS_DIRECTORY', `.hoststat')dnl
 define(`confTO_HOSTSTATUS', `30m')dnl
 dnl
+dnl Don't prioritize a message based on the number of recepients.
+dnl This prevents retries from having higher priority than new batches.
+define(`confWORK_RECIPIENT_FACTOR', `0')dnl
+dnl
+dnl Reduce ClassFactor
+define(`confWORK_CLASS_FACTOR', `1000')dnl
+dnl
 dnl Always use fully qualified domains
 FEATURE(always_add_domain)
 dnl
@@ -62,8 +69,8 @@ define(`confCLIENT_CERT', `CERT_DIR/mycert.pem')dnl
 define(`confCLIENT_KEY', `CERT_DIR/mykey.pem')dnl
 dnl
 dnl Queue options for /var/spool/mqueue:
-dnl   Up to 7 simultaneous queue runners, max 20 recipients per envelope
-QUEUE_GROUP(`mqueue', `P=/var/spool/mqueue, R=7, r=20, F=f')
+dnl   Up to 5 simultaneous queue runners, max 30 recipients per envelope
+QUEUE_GROUP(`mqueue', `P=/var/spool/mqueue, R=5, r=30, F=f')
 dnl
 dnl Make mail appear to be from openbsd.org
 MASQUERADE_AS(openbsd.org)
@@ -115,12 +122,48 @@ Kcheckaddress regex -a@MATCH
    ^([0-9]+<@(aol|msn)\.com|[0-9][^<]*<@juno\.com|.{20}[^<]+<@aol\.com)\.?>
 
 #
+# SirCam worm, see below
+#
+KSirCamWormMarker regex -f -aSUSPECT multipart/mixed;boundary=----.+_Outlook_Express_message_boundary
+
+#
 #  Names that won't be allowed in a To: line (local-part and domains)
 #
 C{RejectToLocalparts}		friend you user
 C{RejectToDomains}		public.com the-internet.com
 
 LOCAL_RULESETS
+#########################################################################
+#
+# w32.sircam.worm@mm
+#
+# There are serveral patterns that appear common ONLY to SirCam worm and
+# not to Outlook Express, which claims to have sent the worm.  There are
+# four headers that always appear together and in this order:
+#
+#  X-MIMEOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
+#  X-Mailer: Microsoft Outlook Express 5.50.4133.2400
+#  Content-Type: multipart/mixed; boundary="----27AA9124_Outlook_Express_message_boundary"
+#  Content-Disposition: Multipart message
+#
+# Empirical study of the worm message headers vs. true Outlook Express
+# (5.50.4133.2400 & 5.50.4522.1200) messages with multipart/mixed attachments
+# shows Outlook Express does:
+#
+#  a) NOT supply a Content-Disposition header for multipart/mixed messages.
+#  b) NOT specify the header X-MimeOLE header name in all-caps
+#  c) NOT specify boundary tag with the expression "_Outlook_Express_message_boundary"
+#
+# The solution below catches any one of this three issues. This is not an ideal
+# solution, but a temporary measure. A correct solution would be to check for
+# the presence of ALL three header attributes. Also the solution is incomplete
+# since Outlook Express 5.0 and 4.0 were not compared.
+#
+# NOTE regex keys are first dequoted and spaces removed before matching.
+# This caused me no end of grief.
+#
+#########################################################################
+
 #
 # Header checks
 #
@@ -128,7 +171,8 @@ HTo: $>CheckTo
 HMessage-Id: $>CheckMessageId
 HSubject: $>Check_Subject
 HX-Spanska: $>Spanska
-HContent-Type: $>Check_Content
+HContent-Type: $>CheckContentType
+HContent-Disposition:	$>CheckContentDisposition
 
 #
 # Melissa worm detection (done in Check_Subject)
@@ -152,7 +196,7 @@ D{LSPat}Fw: Life stages
 D{LSMsg}This message may contain the Life stages virus; see http://www.f-secure.com/v-descs/stages.htm
 
 #
-# W32/Badtrans worm detection (done in Check_Content)
+# W32/Badtrans worm detection (done in CheckContentType)
 # See see http://vil.nai.com/vil/virusSummary.asp?virus_k=99069
 #
 D{WPat1}boundary= \"====_ABC1234567890DEF_====\"
@@ -201,6 +245,16 @@ RRe: ${LSPat}			$#error $: 553 ${LSMsg}
 #
 # Check Content-Type header for worm/virus telltales
 #
-SCheck_Content
+SCheckContentType
+R$+				$: $(SirCamWormMarker $1 $)
 R$+ ${WPat1} $*			$#error $: 553 ${WMsg}
 R$+ ${WPat2} $*			$#error $: 553 ${WMsg}
+RSUSPECT			$#error $: "553 Possible virus, see http://www.symantec.com/avcenter/venc/data/w32.sircam.worm@mm.html"
+
+#
+# Check Content-Disposition header for worm/virus telltales
+#
+SCheckContentDisposition
+R$-			$@ OK
+R$- ; $+		$@ OK
+R$*			$#error $: "553 Illegal Content-Disposition"
diff --git a/gnu/usr.sbin/sendmail/cf/cf/submit.mc b/gnu/usr.sbin/sendmail/cf/cf/submit.mc
index d2c62558153..e8467756c30 100644
--- a/gnu/usr.sbin/sendmail/cf/cf/submit.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/submit.mc
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001, 2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -15,10 +15,11 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Sendmail: submit.mc,v 8.5 2001/09/08 01:20:53 gshapiro Exp $')
+VERSIONID(`$Sendmail: submit.mc,v 8.6 2002/03/26 03:30:58 ca Exp $')
 define(`confCF_VERSION', `Submit')dnl
 define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
 define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
+define(`confTIME_ZONE', `USE_TZ')dnl
 define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl
 FEATURE(`accept_unresolvable_domains')dnl
 FEATURE(`msp')dnl
diff --git a/gnu/usr.sbin/sendmail/cf/feature/access_db.m4 b/gnu/usr.sbin/sendmail/cf/feature/access_db.m4
index de078d94707..5e4d020310a 100644
--- a/gnu/usr.sbin/sendmail/cf/feature/access_db.m4
+++ b/gnu/usr.sbin/sendmail/cf/feature/access_db.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 
 divert(0)
-VERSIONID(`$Sendmail: access_db.m4,v 8.23 2001/03/16 00:51:25 gshapiro Exp $')
+VERSIONID(`$Sendmail: access_db.m4,v 8.24 2002/03/06 21:50:25 ca Exp $')
 divert(-1)
 
 define(`_ACCESS_TABLE_', `')
@@ -21,14 +21,18 @@ ifelse(lower(_ARG3_),`skip',`define(`_ACCESS_SKIP_', `1')')
 ifelse(lower(_ARG3_),`lookupdotdomain',`define(`_LOOKUPDOTDOMAIN_', `1')')
 define(`_ATMPF_', `<TMPF>')dnl
 dnl check whether arg contains -T`'_ATMPF_
+dnl unless it is a sequence map
 ifelse(defn(`_ARG_'), `', `',
-	defn(`_ARG_'), `LDAP', `',
-	`ifelse(index(_ARG_, _ATMPF_), `-1',
-	`errprint(`*** WARNING: missing -T'_ATMPF_` in argument of FEATURE(`access_db',' defn(`_ARG_')`)
+  defn(`_ARG_'), `LDAP', `',
+  `ifelse(index(_ARG_, `sequence '), `0', `',
+    `ifelse(index(_ARG_, _ATMPF_), `-1',
+      `errprint(`*** WARNING: missing -T'_ATMPF_` in argument of FEATURE(`access_db',' defn(`_ARG_')`)
 ')
-	define(`_ABP_', index(_ARG_, ` '))
-	define(`_NARG_', `substr(_ARG_, 0, _ABP_) -T'_ATMPF_` substr(_ARG_, _ABP_)')
-')')
+      define(`_ABP_', index(_ARG_, ` '))
+      define(`_NARG_', `substr(_ARG_, 0, _ABP_) -T'_ATMPF_` substr(_ARG_, _ABP_)')
+      ')
+    ')
+  ')
 
 LOCAL_CONFIG
 # Access list database (for spam stomping)
diff --git a/gnu/usr.sbin/sendmail/cf/feature/compat_check.m4 b/gnu/usr.sbin/sendmail/cf/feature/compat_check.m4
index 409c5cd88e8..9928eff8d10 100644
--- a/gnu/usr.sbin/sendmail/cf/feature/compat_check.m4
+++ b/gnu/usr.sbin/sendmail/cf/feature/compat_check.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@ divert(-1)
 #
 #
 divert(0)
-VERSIONID(`$Sendmail: compat_check.m4,v 1.3 2001/11/21 18:40:06 ca Exp $')
+VERSIONID(`$Sendmail: compat_check.m4,v 1.4 2002/02/26 22:15:31 gshapiro Exp $')
 divert(-1)
 ifdef(`_ACCESS_TABLE_', `',
 `errprint(`FEATURE(`compat_check') requires FEATURE(`access_db')
@@ -25,7 +25,7 @@ R$+ $| $+		$: <$(access Compat:$1<@>$2 $:OK $)>
 R$* $| $*		$@ ok
 # act on the result,
 # it must be one of the following... anything else will be allowed..
-dnl for consistency with the other two even though discard does not take an
+dnl for consistency with the other two even though discard does not take a
 dnl reply code
 R< DISCARD:$* >	$#discard $: $1 " - discarded by check_compat"
 R< DISCARD $* >	$#discard $: $1 " - discarded by check_compat"
diff --git a/gnu/usr.sbin/sendmail/cf/feature/ldap_routing.m4 b/gnu/usr.sbin/sendmail/cf/feature/ldap_routing.m4
index 677ce67d8c5..463796ad7c7 100644
--- a/gnu/usr.sbin/sendmail/cf/feature/ldap_routing.m4
+++ b/gnu/usr.sbin/sendmail/cf/feature/ldap_routing.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 
 divert(0)
-VERSIONID(`$Sendmail: ldap_routing.m4,v 8.8 2001/06/27 21:46:31 gshapiro Exp $')
+VERSIONID(`$Sendmail: ldap_routing.m4,v 8.10 2002/03/27 22:17:43 ca Exp $')
 divert(-1)
 
 # Check first two arguments.  If they aren't set, may need to warn in proto.m4
@@ -31,9 +31,9 @@ ifelse(len(X`'_ARG4_), `1', `',
 LOCAL_CONFIG
 # LDAP routing maps
 Kldapmh ifelse(len(X`'_ARG1_), `1',
-	       `ldap -1 -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
+	       `ldap -1 -T<TMPF> -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
 	       `_ARG1_')
 
 Kldapmra ifelse(len(X`'_ARG2_), `1',
-		`ldap -1 -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
+		`ldap -1 -T<TMPF> -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
 		`_ARG2_')
diff --git a/gnu/usr.sbin/sendmail/cf/feature/msp.m4 b/gnu/usr.sbin/sendmail/cf/feature/msp.m4
index e793ca0bde1..30df11ee466 100644
--- a/gnu/usr.sbin/sendmail/cf/feature/msp.m4
+++ b/gnu/usr.sbin/sendmail/cf/feature/msp.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,9 +10,9 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Sendmail: msp.m4,v 1.29 2001/12/13 23:56:38 gshapiro Exp $')
+VERSIONID(`$Sendmail: msp.m4,v 1.32 2002/03/26 22:02:03 ca Exp $')
 divert(-1)
-define(`ALIAS_FILE', `')
+undefine(`ALIAS_FILE')
 define(`confDELIVERY_MODE', `i')
 define(`confUSE_MSP', `True')
 define(`confFORWARD_PATH', `')
@@ -29,10 +29,10 @@ dnl notice: do not test for QUEUE_DIR, it is set in some ostype/*.m4 files
 ifdef(`MSP_QUEUE_DIR',
 `define(`QUEUE_DIR', `MSP_QUEUE_DIR')',
 `define(`QUEUE_DIR', `/var/spool/clientmqueue')')
-define(`_MTA_HOST_', ifelse(defn(`_ARG_'), `', `localhost', `_ARG_'))
+define(`_MTA_HOST_', ifelse(defn(`_ARG_'), `', `[localhost]', `_ARG_'))
 define(`_MSP_FQHN_',`dnl used to qualify addresses
 ifdef(`MASQUERADE_NAME', ifdef(`_MASQUERADE_ENVELOPE_', `$M', `$j'), `$j')')
-define(`RELAY_MAILER_ARGS', `TCP $h'ifelse(_ARG2_, `MSA', ` 587'))
+ifelse(_ARG2_, `MSA', `define(`RELAY_MAILER_ARGS', `TCP $h 587')')
 dnl ---------------------------------------------
 ifdef(`confPID_FILE', `dnl',
 `define(`confPID_FILE', QUEUE_DIR`/sm-client.pid')')
@@ -55,11 +55,11 @@ define(`LOCAL_MAILER_DSN_DIAGNOSTIC_CODE', `SMTP')dnl
 define(`LOCAL_SHELL_PATH', `[IPC]')dnl
 define(`LOCAL_SHELL_FLAGS', `lmDFMuXk5')dnl
 define(`LOCAL_SHELL_ARGS', `TCP $h')dnl
-MODIFY_MAILER_FLAGS(`SMTP', `+k05')dnl
-MODIFY_MAILER_FLAGS(`ESMTP', `+k05')dnl
-MODIFY_MAILER_FLAGS(`DSMTP', `+k05')dnl
-MODIFY_MAILER_FLAGS(`SMTP8', `+k05')dnl
-MODIFY_MAILER_FLAGS(`RELAY', `+k0')dnl
+MODIFY_MAILER_FLAGS(`SMTP', `+k5')dnl
+MODIFY_MAILER_FLAGS(`ESMTP', `+k5')dnl
+MODIFY_MAILER_FLAGS(`DSMTP', `+k5')dnl
+MODIFY_MAILER_FLAGS(`SMTP8', `+k5')dnl
+MODIFY_MAILER_FLAGS(`RELAY', `+k')dnl
 MAILER(`local')dnl
 MAILER(`smtp')dnl
 
diff --git a/gnu/usr.sbin/sendmail/cf/m4/proto.m4 b/gnu/usr.sbin/sendmail/cf/m4/proto.m4
index 135f95fcb9b..08b887b7ec8 100644
--- a/gnu/usr.sbin/sendmail/cf/m4/proto.m4
+++ b/gnu/usr.sbin/sendmail/cf/m4/proto.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983, 1995 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@ divert(-1)
 #
 divert(0)
 
-VERSIONID(`$Sendmail: proto.m4,v 8.628 2001/12/28 19:02:40 ca Exp $')
+VERSIONID(`$Sendmail: proto.m4,v 8.639 2002/04/02 23:42:42 gshapiro Exp $')
 
 # level CF_LEVEL config file format
 V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')
@@ -337,7 +337,8 @@ _OPTION(OldStyleHeaders, `confOLD_STYLE_HEADERS', `False')
 
 # SMTP daemon options
 ifelse(defn(`confDAEMON_OPTIONS'), `', `dnl',
-`errprint(WARNING: `confDAEMON_OPTIONS' is no longer valid.  See cf/README for more information.
+`errprint(WARNING: `confDAEMON_OPTIONS' is no longer valid.
+	Use `DAEMON_OPTIONS()'; see cf/README.
 )'dnl
 `DAEMON_OPTIONS(`confDAEMON_OPTIONS')')
 ifelse(defn(`_DPO_'), `',
@@ -395,6 +396,10 @@ O QueueDirectory=ifdef(`QUEUE_DIR', QUEUE_DIR, `/var/spool/mqueue')
 # key for shared memory; 0 to turn off
 _OPTION(SharedMemoryKey, `confSHARED_MEMORY_KEY', `0')
 
+ifdef(`confSHARED_MEMORY_KEY_FILE', `dnl
+# file to store key for shared memory (if SharedMemoryKey = -1)
+O SharedMemoryKeyFile=confSHARED_MEMORY_KEY_FILE')
+
 # timeouts (many of these)
 _OPTION(Timeout.initial, `confTO_INITIAL', `5m')
 _OPTION(Timeout.connect, `confTO_CONNECT', `5m')
@@ -1416,6 +1421,10 @@ SLDAPExpand
 # do the LDAP lookups
 R<$+><$+><$*>	$: <$(ldapmra $2 $: $)> <$(ldapmh $2 $: $)> <$1> <$2> <$3>
 
+# look for temporary failures (return original address, MTA will queue up)
+R<$* <TMPF>> <$*> <$+> <$+> <$*>	$@ $2
+R<$*> <$* <TMPF>> <$+> <$+> <$*>	$@ $2
+
 # if mailRoutingAddress and local or non-existant mailHost,
 # return the new mailRoutingAddress
 ifelse(_LDAP_ROUTE_DETAIL_, `_PRESERVE_', `dnl
@@ -2104,7 +2113,7 @@ ifdef(`_RELAY_LOCAL_FROM_', `dnl
 # check whether local FROM is ok
 R<?> $+ < @ $=w >	$@ RELAY		FROM local', `dnl')
 ifdef(`_RELAY_DB_FROM_', `dnl
-R<?> $+ < @ $+ >	$: <@> $>SearchList <! From> $| <F:$1@$2> ifdef(`_RELAY_DB_FROM_DOMAIN_', `<D:$2>') <>
+R<?> $+ < @ $+ >	$: <@> $>SearchList <! From> $| <F:$1@$2> ifdef(`_RELAY_DB_FROM_DOMAIN_', ifdef(`_RELAY_HOSTS_ONLY_', `<E:$2>', `<D:$2>')) <>
 R<@> <RELAY>		$@ RELAY		RELAY FROM sender ok
 ifdef(`_ATMPF_', `R<@> <_ATMPF_>		$#TEMP $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl')
 ', `dnl
@@ -2201,9 +2210,10 @@ dnl should we "clean up" $&f?
 ifdef(`_FFR_MAIL_MACRO',
 `R$*			$: $1 $| $>checkmail $&{mail_from}',
 `R$*			$: $1 $| $>checkmail <$&f>')
+dnl recipient (canonical format) $| result of checkmail
 R$* $| $#$*		$#$2
 dnl run further checks: check_relay
-R$*			$: $1 $| $>checkrelay $&{client_name} $| $&{client_addr}
+R$* $| $*		$: $1 $| $>checkrelay $&{client_name} $| $&{client_addr}
 R$* $| $#$*		$#$2
 R$* $| $*		$: $1
 ', `dnl')
diff --git a/gnu/usr.sbin/sendmail/cf/m4/version.m4 b/gnu/usr.sbin/sendmail/cf/m4/version.m4
index c7c34127fd4..2500d095340 100644
--- a/gnu/usr.sbin/sendmail/cf/m4/version.m4
+++ b/gnu/usr.sbin/sendmail/cf/m4/version.m4
@@ -11,8 +11,8 @@ divert(-1)
 # the sendmail distribution.
 #
 #
-VERSIONID(`$Sendmail: version.m4,v 8.81 2002/01/13 18:23:32 ca Exp $')
+VERSIONID(`$Sendmail: version.m4,v 8.89 2002/04/04 22:20:08 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.12.2`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.12.3`'ifdef(`confCF_VERSION', `/confCF_VERSION')
diff --git a/gnu/usr.sbin/sendmail/cf/ostype/darwin.m4 b/gnu/usr.sbin/sendmail/cf/ostype/darwin.m4
index 094a4646940..2ed4c2bcacf 100644
--- a/gnu/usr.sbin/sendmail/cf/ostype/darwin.m4
+++ b/gnu/usr.sbin/sendmail/cf/ostype/darwin.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000, 2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -8,10 +8,11 @@ divert(-1)
 # the sendmail distribution.
 #
 #
-#
 
 divert(0)
-VERSIONID(`$Sendmail: darwin.m4,v 8.1 2000/06/15 06:36:30 gshapiro Exp $')
+VERSIONID(`$Sendmail: darwin.m4,v 8.3 2002/03/05 01:55:40 ca Exp $')
 ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
+dnl turn on S flag for local mailer
+MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
 ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
 ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl