11 files changed, 98 insertions, 60 deletions

diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index 646163b047d6..9d46e8fba674 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -77,7 +77,7 @@ Let's examine a typical .mc file:
 
 	divert(-1)
 	#
-	# Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+	# Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers.
 	#	All rights reserved.
 	# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 	# Copyright (c) 1988, 1993
@@ -492,11 +492,12 @@ QPAGE_MAILER_QGRP	[undefined] The queue group for the qpage mailer.
 LOCAL_PROG_QGRP		[undefined] The queue group for the prog mailer.
 
 Note: to tweak Name_MAILER_FLAGS use the macro MODIFY_MAILER_FLAGS:
-MODIFY_MAILER_FLAGS(`Name', `change') where Name is the first part of
-the macro Name_MAILER_FLAGS and change can be: flags that should
-be used directly (thus overriding the default value), or if it
-starts with `+' (`-') then those flags are added to (removed from)
-the default value.  Example:
+MODIFY_MAILER_FLAGS(`Name', `change') where Name is the first part
+of the macro Name_MAILER_FLAGS (note: that means Name is entirely in
+upper case) and change can be: flags that should be used directly
+(thus overriding the default value), or if it starts with `+' (`-')
+then those flags are added to (removed from) the default value.
+Example:
 
 	MODIFY_MAILER_FLAGS(`LOCAL', `+e')
 
@@ -958,7 +959,7 @@ generics_entire_domain
 
 virtusertable	A domain-specific form of aliasing, allowing multiple
 		virtual domains to be hosted on one machine.  For example,
-		if the virtuser table contained:
+		if the virtuser table contains:
 
 			info@foo.com	foo-info
 			info@bar.com	bar-info
@@ -1186,7 +1187,7 @@ accept_unqualified_senders
 		Normally, MAIL FROM: commands in the SMTP session will be
 		refused if the connection is a network connection and the
 		sender address does not include a domain name.  If your
-		setup sends local mail unqualified (i.e., MAIL FROM: <joe>),
+		setup sends local mail unqualified (i.e., MAIL FROM:<joe>),
 		you will need to use this feature to accept unqualified
 		sender addresses.  Setting the DaemonPortOptions modifier
 		'u' overrides the default behavior, i.e., unqualified
@@ -1872,7 +1873,8 @@ sections below).
 See the file cf/sendmail.schema for the actual LDAP schemas.  Note that
 this schema (and therefore the lookups and examples below) 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.
+in future versions.  Feedback via sendmail-YYYY@support.sendmail.org is
+encouraged (replace YYYY with the current year, e.g., 2005).
 
 -------
 Aliases
@@ -2336,7 +2338,7 @@ without any prior arrangement).  Along the same lines,
 	FEATURE(`relay_local_from')
 
 will allow relaying if the sender specifies a return path (i.e.
-MAIL FROM: <user@domain>) domain which is a local domain.  This is a
+MAIL FROM:<user@domain>) domain which is a local domain.  This is a
 dangerous feature as it will allow spammers to spam using your mail
 server by simply specifying a return address of user@your.domain.com.
 It should not be used unless absolutely necessary.
@@ -2357,7 +2359,7 @@ allow relaying for roaming users.
 
 
 If source routing is used in the recipient address (e.g.,
-RCPT TO: <user%site.com@othersite.com>), sendmail will check
+RCPT TO:<user%site.com@othersite.com>), sendmail will check
 user@site.com for relaying if othersite.com is an allowed relay host
 in either class {R}, class {m} if FEATURE(`relay_entire_domain') is used,
 or the access database if FEATURE(`access_db') is used.  To prevent
@@ -2522,15 +2524,30 @@ The value part of the map can contain:
 			it but causing the default action.
 	### any text	where ### is an RFC 821 compliant error code and
 			"any text" is a message to return for the command.
-			The string should be quoted to avoid surprises,
-			e.g., sendmail may remove spaces otherwise.
+			The entire string should be quoted to avoid
+			surprises:
+
+				"### any text"
+
+			Otherwise sendmail formats the text as email
+			addresses, e.g., it may remove spaces.
 			This type is deprecated, use one of the two
 			ERROR:  entries below instead.
 	ERROR:### any text
 			as above, but useful to mark error messages as such.
+			If quotes need to be used to avoid modifications
+			(see above), they should be placed like this:
+
+				ERROR:"### any text"
+
 	ERROR:D.S.N:### any text
 			where D.S.N is an RFC 1893 compliant error code
-			and the rest as above.
+			and the rest as above.  If quotes need to be used
+			to avoid modifications, they should be placed
+			like this:
+
+				ERROR:D.S.N:"### any text"
+
 	QUARANTINE:any text
 			Quarantine the message using the given text as the
 			quarantining reason.
@@ -2796,9 +2813,9 @@ That may cause problems with simple header checks due to the
 tokenization.  It might be simpler to use a regex map and apply it
 to $&{currHeader}.
 2. There are no default rulesets coming with this distribution of
-sendmail.  You can either write your own or you can search the
-WWW for examples, e.g.,  http://www.digitalanswers.org/check_local/
-3. When using a default ruleset for headers, the name of the header 
+sendmail.  You can write your own, can search the WWW for examples,
+or take a look at cf/cf/knecht.mc.
+3. When using a default ruleset for headers, the name of the header
 currently being checked can be found in the $&{hdr_name} macro.
 
 After all of the headers are read, the check_eoh ruleset will be called for
@@ -4011,12 +4028,17 @@ confDONT_INIT_GROUPS	DontInitGroups	[False] If set, the initgroups(3)
 					will only have their primary
 					(/etc/passwd) group permissions.
 confUNSAFE_GROUP_WRITES	UnsafeGroupWrites
-					[False] If set, group-writable
+					[True] If set, group-writable
 					:include: and .forward files are
 					considered "unsafe", that is, programs
 					and files cannot be directly referenced
 					from such files.  World-writable files
 					are always considered unsafe.
+					Notice: this option is deprecated and
+					will be removed in future versions;
+					Set GroupWritableForwardFileSafe
+					and GroupWritableIncludeFileSafe in
+					DontBlameSendmail if required.
 confCONNECT_ONLY_TO	ConnectOnlyTo	[undefined] override connection
 					address (for testing).
 confCONTROL_SOCKET_NAME	ControlSocketName
@@ -4183,7 +4205,7 @@ confNICE_QUEUE_RUN	NiceQueueRun	[undefined]  If set, the priority of
 confDIRECT_SUBMISSION_MODIFIERS	DirectSubmissionModifiers
 					[undefined] Defines {daemon_flags}
 					for direct submissions.
-confUSE_MSP		UseMSP		[false] Use as mail submission
+confUSE_MSP		UseMSP		[undefined] Use as mail submission
 					program, see sendmail/SECURITY.
 confDELIVER_BY_MIN	DeliverByMin	[0] Minimum time for Deliver By
 					SMTP Service Extension (RFC 2852).
@@ -4583,4 +4605,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.694 $, Last updated $Date: 2005/03/23 21:41:09 $
+$Revision: 8.704 $, Last updated $Date: 2006/02/15 05:49:31 $
diff --git a/contrib/sendmail/cf/cf/Makefile b/contrib/sendmail/cf/cf/Makefile
index eb4f56870773..2b0f4b307a32 100644
--- a/contrib/sendmail/cf/cf/Makefile
+++ b/contrib/sendmail/cf/cf/Makefile
@@ -1,7 +1,7 @@
 #
 #  Makefile for configuration files.
 #
-#	$Id: Makefile,v 8.59 2004/08/06 03:54:05 gshapiro Exp $
+#	$Id: Makefile,v 8.60 2005/06/14 02:16:34 gshapiro Exp $
 #
 
 #
@@ -168,6 +168,7 @@ M4FILES=\
 	${CFDIR}/ostype/dynix3.2.m4 \
 	${CFDIR}/ostype/freebsd4.m4 \
 	${CFDIR}/ostype/freebsd5.m4 \
+	${CFDIR}/ostype/freebsd6.m4 \
 	${CFDIR}/ostype/gnu.m4 \
 	${CFDIR}/ostype/hpux10.m4 \
 	${CFDIR}/ostype/hpux11.m4 \
diff --git a/contrib/sendmail/cf/cf/knecht.mc b/contrib/sendmail/cf/cf/knecht.mc
index 98dbef9eea54..597bc5e49617 100644
--- a/contrib/sendmail/cf/cf/knecht.mc
+++ b/contrib/sendmail/cf/cf/knecht.mc
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001, 2004, 2005 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -19,7 +19,7 @@ divert(-1)
 #
 
 divert(0)
-VERSIONID(`$Id: knecht.mc,v 8.58 2004/01/28 00:54:41 eric Exp $')
+VERSIONID(`$Id: knecht.mc,v 8.61 2005/10/06 05:56:03 ca Exp $')
 OSTYPE(bsd4.4)
 DOMAIN(generic)
 
@@ -43,10 +43,11 @@ define(`confCLIENT_KEY', `CERT_DIR/MYkey.pem')
 
 define(`CYRUS_MAILER_PATH', `/usr/local/cyrus/bin/deliver')
 
-FEATURE(access_db)
-FEATURE(local_lmtp)
-FEATURE(virtusertable)
-FEATURE(mailertable)
+FEATURE(`access_db')
+FEATURE(`blacklist_recipients')
+FEATURE(`local_lmtp')
+FEATURE(`virtusertable')
+FEATURE(`mailertable')
 
 FEATURE(`nocanonify', `canonify_hosts')
 CANONIFY_DOMAIN(`sendmail.org')
@@ -67,9 +68,16 @@ QUEUE_GROUP(`mqueue', `P=/var/spool/mqueue, R=5, r=15, F=f')
 dnl # enable spam assassin
 INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass-milter.sock, F=, T=C:15m;S:4m;R:4m;E:10m')
 
-MAILER(local)
-MAILER(smtp)
-MAILER(cyrus)
+dnl # enable some DNSBLs
+dnl FEATURE(`dnsbl', `dnsbl.sorbs.net', `"550 Mail from " $`'&{client_addr} " refused - see http://www.dnsbl.sorbs.net/"')
+FEATURE(`dnsbl', `sbl-xbl.spamhaus.org', `"550 Mail from " $`'&{client_addr} " refused - see http://www.spamhaus.org/sbl/"')
+FEATURE(`dnsbl', `list.dsbl.org', `"550 Mail from " $`'&{client_addr} " refused - see http://dsbl.org/"')
+FEATURE(`dnsbl', `bl.spamcop.net', `"450 Mail from " $`'&{client_addr} " refused - see http://spamcop.net/bl.shtml"')
+
+
+MAILER(`local')
+MAILER(`smtp')
+MAILER(`cyrus')
 
 LOCAL_RULE_0
 Rcyrus.$+ + $+ < @ $=w . >	$#cyrus $@ $2 $: $1
diff --git a/contrib/sendmail/cf/cf/submit.cf b/contrib/sendmail/cf/cf/submit.cf
index ca292e56ead0..ca8d1fea63e5 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 27 16:38:48 PST 2005
-##### in /extra/home/ca/sm-8.13.4/OpenSource/sendmail-8.13.4/cf/cf
+##### 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
 ##### using ../ as configuration include directory
 #####
 ######################################################################
@@ -35,7 +35,7 @@
 #####  $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $  #####
 
 
-#####  $Id: proto.m4,v 8.711 2004/08/04 21:29:55 ca Exp $  #####
+#####  $Id: proto.m4,v 8.718 2005/08/24 18:07:23 ca Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -114,7 +114,7 @@ D{MTAHost}[127.0.0.1]
 
 
 # Configuration version number
-DZ8.13.4/Submit
+DZ8.13.6/Submit
 
 
 ###############
@@ -252,7 +252,7 @@ O PrivacyOptions=goaway,noetrn,restrictqrun
 #O MinQueueAge=30m
 
 # how many jobs can you process in the queue?
-#O MaxQueueRunSize=10000
+#O MaxQueueRunSize=0
 
 # perform initial split of envelope without checking MX records
 #O FastSplit=1
@@ -380,13 +380,13 @@ O TimeZoneSpec=
 #O HostsFile=/etc/hosts
 
 # dialup line delay on connection failure
-#O DialDelay=10s
+#O DialDelay=0s
 
 # action to take if there are no recipients in the message
-#O NoRecipientAction=add-to-undisclosed
+#O NoRecipientAction=none
 
 # chrooted environment for writing to files
-#O SafeFileEnvironment=/arch
+#O SafeFileEnvironment
 
 # are colons OK in addresses?
 #O ColonOkInAddr=True
diff --git a/contrib/sendmail/cf/feature/dnsbl.m4 b/contrib/sendmail/cf/feature/dnsbl.m4
index c560586cf460..ea7e160a69c1 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 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002, 2005 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -12,7 +12,7 @@ divert(-1)
 ifdef(`DNSBL_MAP', `', `define(`DNSBL_MAP', `dns -R A')')
 divert(0)
 ifdef(`_DNSBL_R_',`dnl',`dnl
-VERSIONID(`$Id: dnsbl.m4,v 8.29 2002/08/09 21:02:08 ca Exp $')
+VERSIONID(`$Id: dnsbl.m4,v 8.30 2005/07/25 20:56:53 ca Exp $')
 define(`_DNSBL_R_',`')
 LOCAL_CONFIG
 # map for DNS based blacklist lookups
@@ -28,6 +28,6 @@ R$-.$-.$-.$-		$: <?> $(dnsbl $4.$3.$2.$1._DNSBL_SRV_. $: OK $)
 R<?>OK			$: OKSOFAR
 ifelse(len(X`'_ARG3_),`1',
 `R<?>$+<TMP>		$: TMPOK',
-`R<?>$+<TMP>		$#error $@ 4.7.1 $: _DNSBL_MSG_TMP_')
+`R<?>$+<TMP>		$#error $@ 4.4.3 $: _DNSBL_MSG_TMP_')
 R<?>$+			$#error $@ 5.7.1 $: _DNSBL_MSG_
 divert(-1)
diff --git a/contrib/sendmail/cf/feature/enhdnsbl.m4 b/contrib/sendmail/cf/feature/enhdnsbl.m4
index c713153b637f..8addd2bbdc61 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 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002, 2005 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@ divert(-1)
 
 divert(0)
 ifdef(`_EDNSBL_R_',`dnl',`dnl
-VERSIONID(`$Id: enhdnsbl.m4,v 1.9 2002/05/19 21:27:29 gshapiro Exp $')
+VERSIONID(`$Id: enhdnsbl.m4,v 1.10 2005/07/25 20:56:53 ca Exp $')
 LOCAL_CONFIG
 define(`_EDNSBL_R_',`')dnl
 # map for enhanced DNS based blacklist lookups
@@ -29,7 +29,7 @@ R$-.$-.$-.$-		$: <?> $(ednsbl $4.$3.$2.$1._EDNSBL_SRV_. $: OK $)
 R<?>OK			$: OKSOFAR
 ifelse(len(X`'_ARG3_),`1',
 `R<?>$+<TMP>		$: TMPOK',
-`R<?>$+<TMP>		$#error $@ 4.7.1 $: _EDNSBL_MSG_TMP_')
+`R<?>$+<TMP>		$#error $@ 4.4.3 $: _EDNSBL_MSG_TMP_')
 R<?>_EDNSBL_MATCH_	$#error $@ 5.7.1 $: _EDNSBL_MSG_
 ifelse(len(X`'_ARG5_),`1',`dnl',
 `R<?>_ARG5_	$#error $@ 5.7.1 $: _EDNSBL_MSG_')
diff --git a/contrib/sendmail/cf/feature/mtamark.m4 b/contrib/sendmail/cf/feature/mtamark.m4
index ae5f07a24b5a..c306c44e3ed7 100644
--- a/contrib/sendmail/cf/feature/mtamark.m4
+++ b/contrib/sendmail/cf/feature/mtamark.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2004, 2005 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -11,7 +11,7 @@ divert(-1)
 
 divert(0)
 ifdef(`_MTAMARK_R',`dnl',`dnl
-VERSIONID(`$Id: mtamark.m4,v 1.1 2004/03/22 19:22:40 ca Exp $')
+VERSIONID(`$Id: mtamark.m4,v 1.2 2005/07/25 20:56:53 ca Exp $')
 LOCAL_CONFIG
 define(`_MTAMARK_R',`')dnl
 # map for MTA mark
@@ -29,5 +29,5 @@ R<?>1.		$: OKSOFAR
 R<?>0.		$#error $@ 5.7.1 $: _MTAMARK_MSG_
 ifelse(len(X`'_ARG2_),`1',
 `R<?>$+<TMP>	$: TMPOK',
-`R<?>$+<TMP>	$#error $@ 4.7.1 $: _MTAMARK_MSG_TMP_')
+`R<?>$+<TMP>	$#error $@ 4.4.3 $: _MTAMARK_MSG_TMP_')
 divert(-1)
diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4
index ccad77cec55d..d3db1501335c 100644
--- a/contrib/sendmail/cf/m4/proto.m4
+++ b/contrib/sendmail/cf/m4/proto.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2005 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.711 2004/08/04 21:29:55 ca Exp $')
+VERSIONID(`$Id: proto.m4,v 8.718 2005/08/24 18:07:23 ca Exp $')
 
 # level CF_LEVEL config file format
 V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')
@@ -388,7 +388,7 @@ _OPTION(QueueSortOrder, `confQUEUE_SORT_ORDER', `priority')
 _OPTION(MinQueueAge, `confMIN_QUEUE_AGE', `30m')
 
 # how many jobs can you process in the queue?
-_OPTION(MaxQueueRunSize, `confMAX_QUEUE_RUN_SIZE', `10000')
+_OPTION(MaxQueueRunSize, `confMAX_QUEUE_RUN_SIZE', `0')
 
 # perform initial split of envelope without checking MX records
 _OPTION(FastSplit, `confFAST_SPLIT', `1')
@@ -520,13 +520,13 @@ _OPTION(ServiceSwitchFile, `confSERVICE_SWITCH_FILE', `MAIL_SETTINGS_DIR`'servic
 _OPTION(HostsFile, `confHOSTS_FILE', `/etc/hosts')
 
 # dialup line delay on connection failure
-_OPTION(DialDelay, `confDIAL_DELAY', `10s')
+_OPTION(DialDelay, `confDIAL_DELAY', `0s')
 
 # action to take if there are no recipients in the message
-_OPTION(NoRecipientAction, `confNO_RCPT_ACTION', `add-to-undisclosed')
+_OPTION(NoRecipientAction, `confNO_RCPT_ACTION', `none')
 
 # chrooted environment for writing to files
-_OPTION(SafeFileEnvironment, `confSAFE_FILE_ENV', `/arch')
+_OPTION(SafeFileEnvironment, `confSAFE_FILE_ENV', `')
 
 # are colons OK in addresses?
 _OPTION(ColonOkInAddr, `confCOLON_OK_IN_ADDR', `True')
@@ -2698,6 +2698,11 @@ RSOFTWARE $| <$-:$+> $* 	$#error $@ $2 $: $1 " TLS handshake failed."
 dnl no <reply:dns> i.e. not requirements in the access map
 dnl use default error
 RSOFTWARE $| $* 		$#error $@ ifdef(`TLS_PERM_ERR', `5.7.0', `4.7.0') $: "ifdef(`TLS_PERM_ERR', `503', `403') TLS handshake failed."
+# deal with TLS protocol errors: abort
+RPROTOCOL $| <$-:$+> $* 	$#error $@ $2 $: $1 " STARTTLS failed."
+dnl no <reply:dns> i.e. not requirements in the access map
+dnl use default error
+RPROTOCOL $| $* 		$#error $@ ifdef(`TLS_PERM_ERR', `5.7.0', `4.7.0') $: "ifdef(`TLS_PERM_ERR', `503', `403') STARTTLS failed."
 R$* $| <$*> <VERIFY>		$: <$2> <VERIFY> <> $1
 dnl separate optional requirements
 R$* $| <$*> <VERIFY + $+>	$: <$2> <VERIFY> <$3> $1
diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4
index 0abf7b510cc3..1ee7939205e5 100644
--- a/contrib/sendmail/cf/m4/version.m4
+++ b/contrib/sendmail/cf/m4/version.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 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.132 2005/03/25 18:44:45 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.147 2006/03/08 19:21:23 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.13.4`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.13.6`'ifdef(`confCF_VERSION', `/confCF_VERSION')
diff --git a/contrib/sendmail/cf/ostype/darwin.m4 b/contrib/sendmail/cf/ostype/darwin.m4
index 09d58480a399..ee5abe703c69 100644
--- a/contrib/sendmail/cf/ostype/darwin.m4
+++ b/contrib/sendmail/cf/ostype/darwin.m4
@@ -10,9 +10,10 @@ divert(-1)
 #
 
 divert(0)
-VERSIONID(`$Id: darwin.m4,v 8.3 2002/03/05 01:55:40 ca Exp $')
+VERSIONID(`$Id: darwin.m4,v 8.4 2005/06/30 01:16:04 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
+define(`confDONT_BLAME_SENDMAIL', `AssumeSafeChown,GroupWritableDirPathSafe')dnl
diff --git a/contrib/sendmail/cf/sendmail.schema b/contrib/sendmail/cf/sendmail.schema
index a532f8b33f65..fd8c740f24ca 100644
--- a/contrib/sendmail/cf/sendmail.schema
+++ b/contrib/sendmail/cf/sendmail.schema
@@ -1,15 +1,16 @@
-# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002, 2005 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.21 2002/11/20 23:13:50 gshapiro Exp $
+# $Id: sendmail.schema,v 8.22 2005/09/16 20:18:14 ca 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.
+# via sendmail-YYYY@support.sendmail.org is encouraged (replace YYYY with
+# the current year, e.g., 2005).
 
 # OID arcs for Sendmail
 # enterprise:		1.3.6.1.4.1