vendor/sendmail/8.12.11

5 files changed, 23 insertions, 20 deletions

diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index 725f72a337429..ff7057944b754 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -2591,9 +2591,9 @@ my.domain and you have
 
 	my.domain	RELAY
 
-in the access map, then all e-mail with a sender address of
-<user@my.domain> gets through, even if check_relay would reject it
-(e.g., based on the hostname or IP address).  This allows spammers
+in the access map, then any e-mail with a sender address of
+<user@my.domain> will not be rejected by check_relay even though
+it would match the hostname or IP address.  This allows spammers
 to get around DNS based blacklist by faking the sender address.  To
 avoid this problem you have to use tagged entries:
 
@@ -3858,11 +3858,11 @@ confMAX_RCPTS_PER_MESSAGE  MaxRecipientsPerMessage
 					receive a 452 error code (i.e., they
 					are deferred for the next delivery
 					attempt).
-confBAD_RCPT_THROTTLE	BadRcptThrottle	[infinite] If set and more than the
-					specified number of recipients in an
-					envelope are rejected, sleep for one
-					second after each rejected RCPT
-					command.
+confBAD_RCPT_THROTTLE	BadRcptThrottle	[infinite] If set and the specified
+					number of recipients in a single SMTP
+					transaction have been rejected, sleep
+					for one second after each subsequent
+					RCPT command in that transaction.
 confDONT_PROBE_INTERFACES  DontProbeInterfaces
 					[False] If set, sendmail will _not_
 					insert the names and addresses of any
@@ -4375,4 +4375,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.623.2.25 $, Last updated $Date: 2003/06/18 18:47:21 $
+$Revision: 8.623.2.27 $, Last updated $Date: 2004/01/11 17:58:25 $
diff --git a/contrib/sendmail/cf/cf/submit.cf b/contrib/sendmail/cf/cf/submit.cf
index f7d3e18cce4d6..cb9f8c708d022 100644
--- a/contrib/sendmail/cf/cf/submit.cf
+++ b/contrib/sendmail/cf/cf/submit.cf
@@ -24,7 +24,7 @@
 ######################################################################
 ######################################################################
 
-#####  $Id: cfhead.m4,v 8.108.2.3 2003/04/03 17:51:51 ca Exp $  #####
+#####  $Id: cfhead.m4,v 8.108.2.6 2003/12/05 02:26:47 ca Exp $  #####
 #####  $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $  #####
 #####  $Id: submit.mc,v 8.6.2.7 2003/09/10 22:11:56 ca Exp $  #####
 #####  $Id: msp.m4,v 1.32 2002/03/26 22:02:03 ca Exp $  #####
@@ -32,7 +32,7 @@
 #####  $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $  #####
 
 
-#####  $Id: proto.m4,v 8.649.2.24 2003/08/04 21:14:26 ca Exp $  #####
+#####  $Id: proto.m4,v 8.649.2.30 2004/01/11 17:54:06 ca Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -60,6 +60,7 @@ Cwlocalhost
 # ... define this only if sendmail cannot automatically determine your domain
 #Dj$w.Foo.COM
 
+# host/domain names ending with a token in class P are canonical
 CP.
 
 # "Smart" relay host (may be null)
@@ -110,7 +111,7 @@ D{MTAHost}[127.0.0.1]
 
 
 # Configuration version number
-DZ8.12.10/Submit
+DZ8.12.11/Submit
 
 
 ###############
@@ -276,7 +277,7 @@ O QueueDirectory=/var/spool/clientmqueue
 #O Timeout.quit=2m
 #O Timeout.misc=2m
 #O Timeout.command=1h
-#O Timeout.ident=5s
+O Timeout.ident=0
 #O Timeout.fileopen=60s
 #O Timeout.control=2m
 O Timeout.queuereturn=5d
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4
index db3fae712403c..c8b6f35b7dccf 100644
--- a/contrib/sendmail/cf/m4/cfhead.m4
+++ b/contrib/sendmail/cf/m4/cfhead.m4
@@ -305,4 +305,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'')
 
 
 divert(0)dnl
-VERSIONID(`$Id: cfhead.m4,v 8.108.2.3 2003/04/03 17:51:51 ca Exp $')
+VERSIONID(`$Id: cfhead.m4,v 8.108.2.6 2003/12/05 02:26:47 ca Exp $')
diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4
index 411bba0495ef6..48f4eabda02b5 100644
--- a/contrib/sendmail/cf/m4/proto.m4
+++ b/contrib/sendmail/cf/m4/proto.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2004 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(`$Id: proto.m4,v 8.649.2.24 2003/08/04 21:14:26 ca Exp $')
+VERSIONID(`$Id: proto.m4,v 8.649.2.30 2004/01/11 17:54:06 ca Exp $')
 
 # level CF_LEVEL config file format
 V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')
@@ -111,6 +111,7 @@ Fw`'confCW_FILE',
 # ... `define' this only if sendmail cannot automatically determine your domain
 ifdef(`confDOMAIN_NAME', `Dj`'confDOMAIN_NAME', `#Dj$w.Foo.COM')
 
+# host/domain names ending with a token in class P are canonical
 CP.
 
 ifdef(`UUCP_RELAY',
@@ -633,7 +634,8 @@ _OPTION(Milter.LogLevel, `confMILTER_LOG_LEVEL', `')
 _OPTION(Milter.macros.connect, `confMILTER_MACROS_CONNECT', `')
 _OPTION(Milter.macros.helo, `confMILTER_MACROS_HELO', `')
 _OPTION(Milter.macros.envfrom, `confMILTER_MACROS_ENVFROM', `')
-_OPTION(Milter.macros.envrcpt, `confMILTER_MACROS_ENVRCPT', `')')
+_OPTION(Milter.macros.envrcpt, `confMILTER_MACROS_ENVRCPT', `')
+')
 
 # CA directory
 _OPTION(CACertPath, `confCACERT_PATH', `')
diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4
index 299588f3d7e51..b6cc2289bc7c6 100644
--- a/contrib/sendmail/cf/m4/version.m4
+++ b/contrib/sendmail/cf/m4/version.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -11,8 +11,8 @@ divert(-1)
 # the sendmail distribution.
 #
 #
-VERSIONID(`$Id: version.m4,v 8.92.2.22 2003/09/16 20:02:05 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.92.2.26 2004/01/13 00:29:26 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.12.10`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.12.11`'ifdef(`confCF_VERSION', `/confCF_VERSION')