4 files changed, 63 insertions, 24 deletions

diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index 4e6813492f86..d50bfd452bf0 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -221,6 +221,11 @@ to create the pathnames.  The default value of this variable is
 `/etc/mail/'.  If you set this macro to a different value, you MUST include
 a trailing slash.
 
+Notice: all filenames used in a .mc (or .cf) file should be absolute
+(starting at the root, i.e., with '/').  Relative filenames most
+likely cause surprises during operations (unless otherwise noted).
+
+
 +--------+
 | OSTYPE |
 +--------+
@@ -1087,9 +1092,9 @@ delay_checks	The rulesets check_mail and check_relay will not be called
 rbl		This feature is deprecated! Please use dnsbl instead.
 		Turns on rejection of hosts found in the Realtime Blackhole
 		List.  If an argument is provided it is used as the domain
-		in which blocked hosts are listed; otherwise, the main
-		RBL domain rbl.maps.vix.com is used.  For details, see
-		http://maps.vix.com/rbl/.
+		in which blocked hosts are listed; otherwise, the main RBL
+		domain rbl.maps.vix.com is used (see NOTE below).  For
+		details, see http://maps.vix.com/rbl/.
 
 dnsbl		Turns on rejection of hosts found in an DNS based rejection
 		list.  If an argument is provided it is used as the domain
@@ -1102,6 +1107,13 @@ dnsbl		Turns on rejection of hosts found in an DNS based rejection
 		feature can be included several times to query different DNS
 		based rejection lists.
 
+		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/).
+
 loose_relay_check
 		Normally, if % addressing is used for a recipient, e.g.
 		user%site@othersite, and othersite is in class {R}, the
@@ -1819,9 +1831,17 @@ spammers.  To use this database, use
 	FEATURE(`dnsbl')
 
 This will cause sendmail to reject mail from any site in the
-Realtime Blackhole List database.  You can specify an alternative
-RBL domain to check by specifying an argument to the FEATURE.
-The default error message is
+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/).
+
+You can specify an alternative RBL server to check by specifying an
+argument to the FEATURE.  The default error message is
+
+You can specify an alternative RBL domain to check by specifying an
+argument to the FEATURE.  The default error message is
 
 	Mail from $&{client_addr} refused by blackhole site DOMAIN
 
@@ -2013,6 +2033,21 @@ probably not be used in production.
 In this text, cert will be used as an abreviation for X.509 certificate,
 DN is the distinguished name of a cert, and CA is a certification authority.
 
+For STARTTLS to be offered by sendmail you need to set at least
+this variables (the file names and paths are just examples):
+
+	define(`confCACERT_PATH', `/etc/mail/certs/')
+	define(`confCACERT', `/etc/mail/certs/CA.cert.pem')
+	define(`confSERVER_CERT', `/etc/mail/certs/my.cert.pem')
+	define(`confSERVER_KEY', `/etc/mail/certs/my.key.pem')
+
+On systems which do not have the compile flag HASURANDOM set (see
+sendmail/README) you also must set confRAND_FILE.
+
+See doc/op/op.{me,ps} for more information about these options,
+esp. the sections ``Certificates for STARTTLS'' and ``PRNG for
+STARTTLS''.
+
 Macros related to STARTTLS are:
 
 ${cert_issuer} holds the DN of the CA (the cert issuer).
@@ -3278,4 +3313,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.383.2.1.2.43 $, Last updated $Date: 2001/05/24 16:41:53 $
+$Revision: 8.383.2.1.2.47 $, Last updated $Date: 2001/07/13 22:31:49 $
diff --git a/contrib/sendmail/cf/cf/generic-hpux10.mc b/contrib/sendmail/cf/cf/generic-hpux10.mc
index 4db6687821dc..d20586954860 100644
--- a/contrib/sendmail/cf/cf/generic-hpux10.mc
+++ b/contrib/sendmail/cf/cf/generic-hpux10.mc
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -13,14 +13,14 @@ divert(-1)
 #
 
 #
-#  This is a generic configuration file for HP-UX 9.x.
+#  This is a generic configuration file for HP-UX 10.x.
 #  It has support for local and SMTP mail only.  If you want to
 #  customize it, copy it to a name appropriate for your environment
 #  and do the modifications there.
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-hpux10.mc,v 8.11 1999/02/07 07:26:02 gshapiro Exp $')
+VERSIONID(`$Id: generic-hpux10.mc,v 8.11.22.2 2001/05/29 17:30:18 ca Exp $')
 OSTYPE(hpux10)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl
diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4
index 4f10e4c3eb9f..d8a164185dac 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.446.2.5.2.41 2001/05/23 21:32:16 ca Exp $')
+VERSIONID(`$Id: proto.m4,v 8.446.2.5.2.44 2001/07/31 22:25:49 gshapiro Exp $')
 
 MAILER(local)dnl
 
@@ -161,8 +161,10 @@ ifdef(`_ACCEPT_UNRESOLVABLE_DOMAINS_',`dnl',`dnl
 # Resolve map (to check if a host exists in check_mail)
 Kresolve host -a<OK> -T<TEMP>')
 
-ifdef(`_FFR_5_', `# macro storage map
-Kmacro macro')
+ifdef(`_NEED_MACRO_MAP_', `dnl
+ifdef(`_MACRO_MAP_', `', `# macro storage map
+define(`_MACRO_MAP_', `1')dnl
+Kmacro macro')', `dnl')
 
 ifdef(`confCR_FILE', `dnl
 # Hosts for which relaying is permitted ($=R)
@@ -631,7 +633,7 @@ R$* < $* > $* <@>	$: $1 < $2 > $3			unmark <addr>
 R@ $* <@>		$: @ $1				unmark @host:...
 R$* :: $* <@>		$: $1 :: $2			unmark node::addr
 R:`include': $* <@>	$: :`include': $1			unmark :`include':...
-R$* [ IPv6 $- ] <@>	$: $1 [ IPv6 $2 ]		unmark IPv6 addr
+R$* [ IPv6 : $+ ] <@>	$: $1 [ IPv6 : $2 ]		unmark IPv6 addr
 R$* : $* [ $* ]		$: $1 : $2 [ $3 ] <@>		remark if leading colon
 R$* : $* <@>		$: $2				strip colon if marked
 R$* <@>			$: $1				unmark
@@ -707,9 +709,9 @@ ifdef(`_NO_UUCP_', `dnl',
 `R$* < @ localhost . UUCP > $*	$: $1 < @ $j . > $2		.UUCP domain')
 
 # check for IPv6 domain literal (save quoted form)
-R$* < @ [ IPv6 $- ] > $*	$: $2 $| $1 < @@ [ $(dequote $2 $) ] > $3	mark IPv6 addr
-R$- $| $* < @@ $=w > $*		$: $2 < @ $j . > $4		self-literal
-R$- $| $* < @@ [ $+ ] > $*	$@ $2 < @ [ IPv6 $1 ] > $4	canon IP addr
+R$* < @ [ IPv6 : $+ ] > $*	$: $2 $| $1 < @@ [ $(dequote $2 $) ] > $3	mark IPv6 addr
+R$+ $| $* < @@ $=w > $*		$: $2 < @ $j . > $4		self-literal
+R$+ $| $* < @@ [ $+ ] > $*	$@ $2 < @ [ IPv6 : $1 ] > $4	canon IP addr
 
 # check for IPv4 domain literal
 R$* < @ [ $+ ] > $*		$: $1 < @@ [ $2 ] > $3		mark [a.b.c.d]
@@ -907,8 +909,8 @@ ifdef(`_MAILER_smtp_',
 dnl there is no check whether this is really an IP number
 R$* < @ [ $+ ] > $*	$: $>ParseLocal $1 < @ [ $2 ] > $3	numeric internet spec
 R$* < @ [ $+ ] > $*	$1 < @ [ $2 ] : $S > $3		Add smart host to path
-R$* < @ [ IPv6 $- ] : > $*
-		$#_SMTP_ $@ [ $(dequote $2 $) ] $: $1 < @ [IPv6 $2 ] > $3	no smarthost: send
+R$* < @ [ IPv6 : $+ ] : > $*
+		$#_SMTP_ $@ [ $(dequote $2 $) ] $: $1 < @ [IPv6 : $2 ] > $3	no smarthost: send
 R$* < @ [ $+ ] : > $*	$#_SMTP_ $@ [$2] $: $1 < @ [$2] > $3	no smarthost: send
 R$* < @ [ $+ ] : $- : $*> $*	$#$3 $@ $4 $: $1 < @ [$2] > $5	smarthost with mailer
 R$* < @ [ $+ ] : $+ > $*	$#_SMTP_ $@ $3 $: $1 < @ [$2] > $4	smarthost without mailer',
@@ -936,6 +938,8 @@ R<@> $+			$: $1
 R<!> $+			$: $1
 R< error : $-.$-.$- : $+ > $* 	$#error $@ $1.$2.$3 $: $4
 R< error : $- $+ > $* 	$#error $@ $(dequote $1 $) $: $2
+dnl this is not a documented option
+dnl it performs no looping at all for virtusertable
 ifdef(`_NO_VIRTUSER_RECURSION_',
 `R< $+ > $+ < @ $+ >	$: $>ParseLocal $>Parse0 $>canonify $1',
 `R< $+ > $+ < @ $+ >	$: $>Recurse $1')
@@ -1104,7 +1108,7 @@ dnl	<error:text>				-> error
 dnl	<mailer:user@host> lp<@domain>rest	-> mailer host user
 dnl	<mailer:host> address			-> mailer host address
 dnl	<localdomain> address			-> address
-dnl	<[IPv6 number]> address			-> relay number address
+dnl	<[IPv6:number]> address			-> relay number address
 dnl	<host> address				-> relay host address
 ###################################################################
 
@@ -1116,7 +1120,7 @@ R< local : $* > $*		$>CanonLocal < $1 > $2
 R< $- : $+ @ $+ > $*<$*>$*	$# $1 $@ $3 $: $2<@$3>	use literal user
 R< $- : $+ > $*			$# $1 $@ $2 $: $3	try qualified mailer
 R< $=w > $*			$@ $2			delete local host
-R< [ IPv6 $+ ] > $*		$#_RELAY_ $@ $(dequote $1 $) $: $2	use unqualified mailer
+R< [ IPv6 : $+ ] > $*		$#_RELAY_ $@ $(dequote $1 $) $: $2	use unqualified mailer
 R< $+ > $*			$#_RELAY_ $@ $1 $: $2	use unqualified mailer
 
 ###################################################################
@@ -1280,7 +1284,7 @@ dnl 			<result> <passthru>
 SLookUpDomain
 dnl remove IPv6 mark and dequote address
 dnl it is a bit ugly because it is checked on each "iteration"
-R<[IPv6 $-]> <$+> <$*> <$*>	$: <[$(dequote $1 $)]> <$2> <$3> <$4>
+R<[IPv6 : $+]> <$+> <$*> <$*>	$: <[$(dequote $1 $)]> <$2> <$3> <$4>
 dnl workspace <key> <default> <passthru> <mark>
 dnl lookup with tag (in front, no delimiter here)
 R<$*> <$+> <$*> <$- $->		$: < $(access $5`'_TAG_DELIM_`'$1 $: ? $) > <$1> <$2> <$3> <$4 $5>
diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4
index 98afcb6b7710..e04d15e99eec 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.39.4.29 2001/05/27 21:39:20 gshapiro Exp $')
+VERSIONID(`$Id: version.m4,v 8.39.4.33 2001/07/31 22:34:17 gshapiro Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.11.4`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.11.5`'ifdef(`confCF_VERSION', `/confCF_VERSION')