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

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

5 files changed, 19 insertions, 16 deletions

diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index 3c7b7d5..952a16c 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -1213,7 +1213,7 @@ dnsbl		Turns on rejection of hosts found in an DNS based rejection
 		A second argument can be used to change the default error
 		message.  Without that second argument, the error message
 		will be
-			Mail from IP-ADDRESS refused by blackhole site SERVER
+			Rejected: IP-ADDRESS listed at SERVER
 		where IP-ADDRESS and SERVER are replaced by the appropriate
 		information.  By default, temporary lookup failures are
 		ignored.  This behavior can be changed by specifying a
@@ -2430,7 +2430,7 @@ subscribed.  Contact MAPS to subscribe (http://mail-abuse.org/).
 You can specify an alternative RBL server to check by specifying an
 argument to the FEATURE.  The default error message is
 
-	Mail from IP-ADDRESS refused by blackhole site SERVER
+	Rejected: IP-ADDRESS listed at SERVER
 
 where IP-ADDRESS and SERVER are replaced by the appropriate
 information.  A second argument can be used to specify a different
@@ -4311,4 +4311,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.622 $, Last updated $Date: 2002/06/03 13:15:16 $
+$Revision: 8.623 $, Last updated $Date: 2002/06/07 14:14:14 $
diff --git a/contrib/sendmail/cf/cf/submit.cf b/contrib/sendmail/cf/cf/submit.cf
index fe90962..0613bc1 100644
--- a/contrib/sendmail/cf/cf/submit.cf
+++ b/contrib/sendmail/cf/cf/submit.cf
@@ -1,5 +1,5 @@
 #
-# 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
@@ -24,7 +24,7 @@
 ######################################################################
 ######################################################################
 
-#####  $Id: cfhead.m4,v 8.107 2001/07/22 03:25:37 ca Exp $  #####
+#####  $Id: cfhead.m4,v 8.108 2002/06/13 18:53:24 ca Exp $  #####
 #####  $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $  #####
 #####  $Id: submit.mc,v 8.6 2002/03/26 03:30:58 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.646 2002/05/19 21:22:40 gshapiro Exp $  #####
+#####  $Id: proto.m4,v 8.649 2002/06/13 18:53:24 ca Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -110,7 +110,7 @@ D{MTAHost}[localhost]
 
 
 # Configuration version number
-DZ8.12.4/Submit
+DZ8.12.5/Submit
 
 
 ###############
@@ -338,7 +338,7 @@ O TimeZoneSpec=
 #O DelayLA=0
 
 # maximum number of children we allow at one time
-#O MaxDaemonChildren=12
+#O MaxDaemonChildren=0
 
 # maximum number of new connections per second
 #O ConnectionRateThrottle=0
@@ -479,7 +479,6 @@ O PidFile=/var/spool/clientmqueue/sm-client.pid
 #O InputMailFilters
 
 
-
 # CA directory
 #O CACERTPath
 # CA file
diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4
index ab8b457..d601b67 100644
--- a/contrib/sendmail/cf/m4/proto.m4
+++ b/contrib/sendmail/cf/m4/proto.m4
@@ -13,7 +13,7 @@ divert(-1)
 #
 divert(0)
 
-VERSIONID(`$Id: proto.m4,v 8.646 2002/05/19 21:22:40 gshapiro Exp $')
+VERSIONID(`$Id: proto.m4,v 8.649 2002/06/13 18:53:24 ca Exp $')
 
 # level CF_LEVEL config file format
 V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')
@@ -479,7 +479,7 @@ _OPTION(RefuseLA, `confREFUSE_LA', `12')
 _OPTION(DelayLA, `confDELAY_LA', `0')
 
 # maximum number of children we allow at one time
-_OPTION(MaxDaemonChildren, `confMAX_DAEMON_CHILDREN', `12')
+_OPTION(MaxDaemonChildren, `confMAX_DAEMON_CHILDREN', `0')
 
 # maximum number of new connections per second
 _OPTION(ConnectionRateThrottle, `confCONNECTION_RATE_THROTTLE', `0')
@@ -621,7 +621,7 @@ _OPTION(TLSSrvOptions, `confTLS_SRV_OPTIONS', `')
 # Input mail filters
 _OPTION(InputMailFilters, `confINPUT_MAIL_FILTERS', `')
 
-ifdef(`confINPUT_MAIL_FILTERS', `dnl
+ifelse(len(X`'_MAIL_FILTERS_DEF), `1', `dnl', `dnl
 # Milter options
 _OPTION(Milter.LogLevel, `confMILTER_LOG_LEVEL', `')
 _OPTION(Milter.macros.connect, `confMILTER_MACROS_CONNECT', `')
diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4
index 9902120..72d8c22 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.92 2002/05/31 18:53:59 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.92.2.2 2002/06/25 22:51:52 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.12.4`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.12.5`'ifdef(`confCF_VERSION', `/confCF_VERSION')
diff --git a/contrib/sendmail/cf/sendmail.schema b/contrib/sendmail/cf/sendmail.schema
index bab47e8..ebe4c96 100644
--- a/contrib/sendmail/cf/sendmail.schema
+++ b/contrib/sendmail/cf/sendmail.schema
@@ -1,16 +1,17 @@
-# 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
 # forth in the LICENSE file which can be found at the top level of
 # the sendmail distribution.
 #
-# $Id: sendmail.schema,v 8.14 2001/08/31 17:18:18 gshapiro Exp $
+# $Id: sendmail.schema,v 8.19 2002/06/04 17:31:43 gshapiro Exp $
 
 # Note that this schema is experimental at this point as it has had little
 # public review.  Therefore, it may change in future versions.  Feedback
 # via sendmail@sendmail.org is encouraged.
 
+
 # OID arcs for Sendmail
 # enterprise:		1.3.6.1.4.1
 # sendmail:		enterprise.6152
@@ -87,6 +88,7 @@ attributetype ( 1.3.6.1.4.1.6152.10.3.1.16
 	EQUALITY caseIgnoreMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
 
+
 #objectClass sendmailMTAMap
 #	requires
 #		objectClass,
@@ -143,6 +145,7 @@ attributetype ( 1.3.6.1.4.1.6152.10.3.1.20
 	EQUALITY caseIgnoreMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
+
 #objectClass sendmailMTAAlias
 #	requires
 #		objectClass,
@@ -198,6 +201,7 @@ attributetype ( 1.3.6.1.4.1.6152.10.3.1.23
 	EQUALITY caseIgnoreMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
+
 #objectClass sendmailMTAClass
 #	requires
 #		objectClass,