This commit was generated by cvs2svn to compensate for changes in r159609,

which included commits to RCS files with non-trunk default branches.

7 files changed, 35 insertions, 48 deletions

diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index 9d46e8f..fce316e 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -1242,13 +1242,10 @@ use_client_ptr	If this feature is enabled then check_relay will override
 		about check_relay, {client_name}, and {client_ptr}.
 
 dnsbl		Turns on rejection of hosts found in an DNS based rejection
-		list.  If an argument is provided it is used as the domain
-		in which blocked hosts are listed; otherwise it defaults to
-		blackholes.mail-abuse.org.  An explanation for an DNS based
-		rejection list can be found at http://mail-abuse.org/rbl/.
-		A second argument can be used to change the default error
-		message.  Without that second argument, the error message
-		will be
+		list.  The first is used as the domain in which blocked
+		hosts are listed.  A second argument can be used to change
+		the default error message.  Without that second argument,
+		the error message will be
 			Rejected: IP-ADDRESS listed at SERVER
 		where IP-ADDRESS and SERVER are replaced by the appropriate
 		information.  By default, temporary lookup failures are
@@ -1279,13 +1276,6 @@ dnsbl		Turns on rejection of hosts found in an DNS based rejection
 
 		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
-		(MAPS).  As of July 31, 2001, MAPS is a subscription
-		service, so using that network address won't work if you
-		haven't subscribed.  Contact MAPS to subscribe
-		(http://mail-abuse.org/).
-
 enhdnsbl	Enhanced version of dnsbl (see above).  Further arguments
 		(up to 5) can be used to specify specific return values
 		from lookups.  Temporary lookup failures are ignored unless
@@ -2631,22 +2621,16 @@ as value part in the access map.  Taking the example from above:
 Mail can't be sent to spammer@aol.com or anyone at cyberspammer.com.
 That's why tagged entries should be used.
 
-There are several DNS based blacklists, the first of which was
-the RBL (``Realtime Blackhole List'') run by the MAPS project,
-see http://mail-abuse.org/.  These are databases of spammers
+There are several DNS based blacklists which can be found by
+querying a search engine.  These are databases of spammers
 maintained in DNS.  To use such a database, specify
 
-	FEATURE(`dnsbl')
-
-This will cause sendmail to reject mail from any site in the original
-Realtime Blackhole List database.  This default DNS blacklist,
-blackholes.mail-abuse.org, is a service offered by the Mail Abuse
-Prevention System (MAPS).  As of July 31, 2001, MAPS is a subscription
-service, so using that network address won't work if you haven't
-subscribed.  Contact MAPS to subscribe (http://mail-abuse.org/).
+	FEATURE(`dnsbl', `dnsbl.example.com')
 
-You can specify an alternative RBL server to check by specifying an
-argument to the FEATURE.  The default error message is
+This will cause sendmail to reject mail from any site listed in the
+DNS based blacklist.  You must select an DNSB based blacklist domain
+to check by specifying an argument to the FEATURE.  The default
+error message is
 
 	Rejected: IP-ADDRESS listed at SERVER
 
@@ -2668,8 +2652,7 @@ where IP-ADDRESS and SERVER are replaced by the appropriate
 information.
 
 This FEATURE can be included several times to query different
-DNS based rejection lists, e.g., the dial-up user list (see
-http://mail-abuse.org/dul/).
+DNS based rejection lists.
 
 Notice: to avoid checking your own local domains against those
 blacklists, use the access_db feature and add:
@@ -4605,4 +4588,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.704 $, Last updated $Date: 2006/02/15 05:49:31 $
+$Revision: 8.706 $, Last updated $Date: 2006/04/18 22:31:06 $
diff --git a/contrib/sendmail/cf/cf/submit.cf b/contrib/sendmail/cf/cf/submit.cf
index ca8d1fe..8d9e540 100644
--- a/contrib/sendmail/cf/cf/submit.cf
+++ b/contrib/sendmail/cf/cf/submit.cf
@@ -16,8 +16,8 @@
 #####
 #####		SENDMAIL CONFIGURATION FILE
 #####
-##### built by ca@wiz.smi.sendmail.com on Sun Mar 19 22:37:26 PST 2006
-##### in /extra/home/ca/sm-8.13.6/OpenSource/sendmail-8.13.6/cf/cf
+##### built by ca@nother.smi.sendmail.com on Mon Jun 5 15:34:16 PDT 2006
+##### in /extra/home/ca/sm-8.13.7/OpenSource/sendmail-8.13.7/cf/cf
 ##### using ../ as configuration include directory
 #####
 ######################################################################
@@ -29,13 +29,13 @@
 
 #####  $Id: cfhead.m4,v 8.116 2004/01/28 22:02:22 ca Exp $  #####
 #####  $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $  #####
-#####  $Id: submit.mc,v 8.13 2003/09/10 22:12:48 ca Exp $  #####
+#####  $Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $  #####
 #####  $Id: msp.m4,v 1.33 2004/02/09 22:32:38 ca Exp $  #####
 
 #####  $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $  #####
 
 
-#####  $Id: proto.m4,v 8.718 2005/08/24 18:07:23 ca Exp $  #####
+#####  $Id: proto.m4,v 8.719 2006/03/30 20:50:13 ca Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -114,7 +114,7 @@ D{MTAHost}[127.0.0.1]
 
 
 # Configuration version number
-DZ8.13.6/Submit
+DZ8.13.7/Submit
 
 
 ###############
@@ -1441,7 +1441,7 @@ Mrelay,		P=[IPC], F=mDFMuXa8k, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=
 # #
 # 
 # divert(0)dnl
-# VERSIONID(`$Id: submit.mc,v 8.13 2003/09/10 22:12:48 ca Exp $')
+# VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 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
diff --git a/contrib/sendmail/cf/cf/submit.mc b/contrib/sendmail/cf/cf/submit.mc
index 610bbef..d0db478 100644
--- a/contrib/sendmail/cf/cf/submit.mc
+++ b/contrib/sendmail/cf/cf/submit.mc
@@ -15,7 +15,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: submit.mc,v 8.13 2003/09/10 22:12:48 ca Exp $')
+VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 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
diff --git a/contrib/sendmail/cf/feature/dnsbl.m4 b/contrib/sendmail/cf/feature/dnsbl.m4
index ea7e160..ffaa88c 100644
--- a/contrib/sendmail/cf/feature/dnsbl.m4
+++ b/contrib/sendmail/cf/feature/dnsbl.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2002, 2005 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002, 2005, 2006 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -12,13 +12,15 @@ divert(-1)
 ifdef(`DNSBL_MAP', `', `define(`DNSBL_MAP', `dns -R A')')
 divert(0)
 ifdef(`_DNSBL_R_',`dnl',`dnl
-VERSIONID(`$Id: dnsbl.m4,v 8.30 2005/07/25 20:56:53 ca Exp $')
+VERSIONID(`$Id: dnsbl.m4,v 8.32 2006/03/29 22:50:16 ca Exp $')
 define(`_DNSBL_R_',`')
+ifelse(defn(`_ARG_'), `', 
+	`errprint(`*** ERROR: missing argument for FEATURE(`dnsbl')')')
 LOCAL_CONFIG
 # map for DNS based blacklist lookups
 Kdnsbl DNSBL_MAP -T<TMP>ifdef(`DNSBL_MAP_OPT',` DNSBL_MAP_OPT')')
 divert(-1)
-define(`_DNSBL_SRV_', `ifelse(len(X`'_ARG_),`1',`blackholes.mail-abuse.org',_ARG_)')dnl
+define(`_DNSBL_SRV_', `_ARG_')dnl
 define(`_DNSBL_MSG_', `ifelse(len(X`'_ARG2_),`1',`"550 Rejected: " $`'&{client_addr} " listed at '_DNSBL_SRV_`"',`_ARG2_')')dnl
 define(`_DNSBL_MSG_TMP_', `ifelse(_ARG3_,`t',`"451 Temporary lookup failure of " $`'&{client_addr} " at '_DNSBL_SRV_`"',`_ARG3_')')dnl
 divert(8)
diff --git a/contrib/sendmail/cf/feature/enhdnsbl.m4 b/contrib/sendmail/cf/feature/enhdnsbl.m4
index 8addd2b..63a4f15 100644
--- a/contrib/sendmail/cf/feature/enhdnsbl.m4
+++ b/contrib/sendmail/cf/feature/enhdnsbl.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2000-2002, 2005 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002, 2005, 2006 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -9,16 +9,18 @@ divert(-1)
 #
 #
 
+ifelse(defn(`_ARG_'), `', 
+	`errprint(`*** ERROR: missing argument for FEATURE(`enhdnsbl')')')
 divert(0)
 ifdef(`_EDNSBL_R_',`dnl',`dnl
-VERSIONID(`$Id: enhdnsbl.m4,v 1.10 2005/07/25 20:56:53 ca Exp $')
+VERSIONID(`$Id: enhdnsbl.m4,v 1.11 2006/03/31 19:56:16 ca Exp $')
 LOCAL_CONFIG
 define(`_EDNSBL_R_',`')dnl
 # map for enhanced DNS based blacklist lookups
 Kednsbl dns -R A -a. -T<TMP> -r`'ifdef(`EDNSBL_TO',`EDNSBL_TO',`5')
 ')
 divert(-1)
-define(`_EDNSBL_SRV_', `ifelse(len(X`'_ARG_),`1',`blackholes.mail-abuse.org',_ARG_)')dnl
+define(`_EDNSBL_SRV_', `_ARG_')dnl
 define(`_EDNSBL_MSG_', `ifelse(len(X`'_ARG2_),`1',`"550 Rejected: " $`'&{client_addr} " listed at '_EDNSBL_SRV_`"',`_ARG2_')')dnl
 define(`_EDNSBL_MSG_TMP_', `ifelse(_ARG3_,`t',`"451 Temporary lookup failure of " $`'&{client_addr} " at '_EDNSBL_SRV_`"',`_ARG3_')')dnl
 define(`_EDNSBL_MATCH_', `ifelse(len(X`'_ARG4_),`1',`$`'+',_ARG4_)')dnl
diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4
index d3db150..afe4e7d 100644
--- a/contrib/sendmail/cf/m4/proto.m4
+++ b/contrib/sendmail/cf/m4/proto.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2006 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.718 2005/08/24 18:07:23 ca Exp $')
+VERSIONID(`$Id: proto.m4,v 8.719 2006/03/30 20:50:13 ca Exp $')
 
 # level CF_LEVEL config file format
 V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')
@@ -1959,7 +1959,7 @@ R<@> < $* @ $+ . $+ >	$: < $1 @ $2 . $3 >
 dnl prepend daemon_flags
 R<@> $*			$: $&{daemon_flags} $| <@> $1
 dnl workspace: ${daemon_flags} $| <@> <address>
-dnl 'r'equire qual.rcpt: ok
+dnl _r_equire qual.rcpt: ok
 R$* r $* $| <@> < $+ @ $+ >	$: < $3 @ $4 >
 dnl do not allow these at all or only from local systems?
 R$* r $* $| <@> < $* >	$: < ? $&{client_name} > < $3 >
diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4
index 1ee7939..1a75214 100644
--- a/contrib/sendmail/cf/m4/version.m4
+++ b/contrib/sendmail/cf/m4/version.m4
@@ -11,8 +11,8 @@ divert(-1)
 # the sendmail distribution.
 #
 #
-VERSIONID(`$Id: version.m4,v 8.147 2006/03/08 19:21:23 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.150.2.4 2006/06/05 22:32:40 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.13.6`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.13.7`'ifdef(`confCF_VERSION', `/confCF_VERSION')