3 files changed, 28 insertions, 13 deletions

diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index 167d6a4a3f48a..dceb1bc5bb7c0 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -630,8 +630,8 @@ procmail	An interface to procmail (does not come with sendmail).
 			! -oi -f $1 person@other.host
 
 		This would arrange for (anything)@host.com to be sent
-		to person@other.host.  Within the procmail script, $1 is
-		the name of the sender and $2 is the name of the recipient.
+		to person@other.host.  In a procmail script, $1 is the
+		name of the sender and $2 is the name of the recipient.
 		If you use this with FEATURE(`local_procmail'), the FEATURE
 		should be listed first.
 
@@ -1256,7 +1256,13 @@ dnsbl		Turns on rejection of hosts found in an DNS based rejection
 			define(`DNSBL_MAP', `dns -R A')
 
 		before the first use of this feature.  Alternatively you
-		can use enhdnsbl instead (see below).
+		can use enhdnsbl instead (see below).  Moreover, this
+		statement can be used to reduce the number of DNS retries,
+		e.g.,
+
+			define(`DNSBL_MAP', `dns -R A -r2')
+
+		See below (EDNSBL_TO) for an explanation.
 
 		NOTE: The default DNS blacklist, blackholes.mail-abuse.org,
 		is a service offered by the Mail Abuse Prevention System
@@ -1285,7 +1291,13 @@ enhdnsbl	Enhanced version of dnsbl (see above).  Further arguments
 		has been compiled with the flag DNSMAP (see sendmail/README).
 
 		Set the EDNSBL_TO mc option to change the DNS retry count
-		from the default value of 5.
+		from the default value of 5, this can be very useful when
+		a DNS server is not responding, which in turn may cause
+		clients to time out (an entry stating
+
+			did not issue MAIL/EXPN/VRFY/ETRN
+
+		will be logged).
 
 lookupdotdomain	Look up also .domain in the access map.  This allows to
 		match only subdomains.  It does not work well with
@@ -2975,7 +2987,10 @@ by the ruleset authinfo or by the option DefaultAuthInfo.  The
 authinfo ruleset looks up {server_name} using the tag AuthInfo: in
 the access map.  If no entry is found, {server_addr} is looked up
 in the same way and finally just the tag AuthInfo: to provide
-default values.
+default values.  Note: searches for domain parts or IP nets are
+only performed if the access map is used; if the authinfo feature
+is used then only up to three lookups are performed (two exact
+matches, one default).
 
 Notice: the default configuration file causes the option DefaultAuthInfo
 to fail since the ruleset authinfo is in the .cf file. If you really
@@ -2997,9 +3012,9 @@ Valid values for the tag are:
 Example entries are:
 
 AuthInfo:other.dom "U:user" "I:user" "P:secret" "R:other.dom" "M:DIGEST-MD5"
-AuthInfo:more.dom "U:user" "P=c2VjcmV0"
+AuthInfo:host.more.dom "U:user" "P=c2VjcmV0"
 
-User or authentication id must exist as well as the password.  All
+User id or authentication id must exist as well as the password.  All
 other entries have default values.  If one of user or authentication
 id is missing, the existing value is used for the missing item.
 If "R:" is not specified, realm defaults to $j.  The list of mechanisms
@@ -4360,4 +4375,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.623.2.18 $, Last updated $Date: 2002/12/29 04:16:51 $
+$Revision: 8.623.2.21 $, Last updated $Date: 2003/01/17 00:36:57 $
diff --git a/contrib/sendmail/cf/cf/submit.cf b/contrib/sendmail/cf/cf/submit.cf
index 6024a971836a9..216716e0500b1 100644
--- a/contrib/sendmail/cf/cf/submit.cf
+++ b/contrib/sendmail/cf/cf/submit.cf
@@ -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.13 2002/12/04 00:12:18 ca Exp $  #####
+#####  $Id: proto.m4,v 8.649.2.14 2002/12/30 15:46:02 ca Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -110,7 +110,7 @@ D{MTAHost}[127.0.0.1]
 
 
 # Configuration version number
-DZ8.12.7/Submit
+DZ8.12.8/Submit
 
 
 ###############
diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4
index 40bf18419061d..2a886db57f0e8 100644
--- a/contrib/sendmail/cf/m4/version.m4
+++ b/contrib/sendmail/cf/m4/version.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2003 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.11 2002/12/28 19:45:55 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.92.2.14 2003/01/15 17:55:43 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.12.7`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.12.8`'ifdef(`confCF_VERSION', `/confCF_VERSION')