Must put Cw entries in LOCAL_CONFIG section or they seem to get ignored.

diff --git a/gnu/usr.sbin/sendmail/cf/cf/elbereth.mc b/gnu/usr.sbin/sendmail/cf/cf/elbereth.mc
index 4b7c183..795b95b 100644 (file)
--- a/gnu/usr.sbin/sendmail/cf/cf/elbereth.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/elbereth.mc
@@ -29,7 +29,7 @@ divert(-1)
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-VERSIONID(`$OpenBSD: elbereth.mc,v 1.1 2000/04/02 19:48:11 millert Exp $')dnl
+VERSIONID(`$OpenBSD: elbereth.mc,v 1.2 2000/04/02 21:22:35 millert Exp $')dnl
 OSTYPE(openbsd)dnl
 MASQUERADE_AS(primark.com)dnl
 FEATURE(masquerade_envelope)dnl
@@ -37,4 +37,5 @@ define(`SMART_HOST', `mailhost.disclosure.com')
 MAILER(local)dnl
 MAILER(smtp)dnl
 
+LOCAL_CONFIG
 Cw elbereth elbereth.primark.com elbereth.disclosure.com localhost localhost.primark.com localhost.disclosure.com

diff --git a/gnu/usr.sbin/sendmail/cf/cf/gandalf.mc b/gnu/usr.sbin/sendmail/cf/cf/gandalf.mc
index 097b2af..360af6a 100644 (file)
--- a/gnu/usr.sbin/sendmail/cf/cf/gandalf.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/gandalf.mc
@@ -29,7 +29,7 @@ divert(-1)
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-VERSIONID(`$OpenBSD: gandalf.mc,v 1.1 2000/04/02 19:48:11 millert Exp $')dnl
+VERSIONID(`$OpenBSD: gandalf.mc,v 1.2 2000/04/02 21:22:35 millert Exp $')dnl
 OSTYPE(openbsd)dnl
 DOMAIN(sigmasoft)dnl
 MASQUERADE_AS(SigmaSoft.COM)dnl
@@ -41,9 +41,9 @@ MAILER(local)dnl
 MAILER(smtp)dnl
 MAILER(procmail)dnl
 
+LOCAL_CONFIG
 Cw SigmaSoft.COM
 
-LOCAL_CONFIG
 #
 #  Regular expression to reject:
 #    * numeric-only localparts from aol.com and msn.com

diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
index 0892999..084591e 100644 (file)
--- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
@@ -5,7 +5,7 @@ divert(-1)
 # This machine handles all mail for openbsd.{org,com,net}
 #
 
-VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.1 2000/04/02 19:48:13 millert Exp $')
+VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.2 2000/04/02 21:22:35 millert Exp $')
 OSTYPE(openbsd)dnl
 dnl
 dnl Advertise ourselves as ``openbsd.org''
@@ -24,12 +24,6 @@ dnl
 dnl Always use fully qualified domains
 FEATURE(always_add_domain)
 dnl
-dnl Treat mail to openbsd.{org,net,com} as local
-Cw openbsd.org
-Cw openbsd.net
-Cw openbsd.com
-Cw anonopenbsd.cs.colorado.edu
-dnl
 dnl Need to add domo and mailman as "trusted users" to rewrite From lines
 define(`confTRUSTED_USERS', `domo mailman')
 dnl
@@ -57,6 +51,11 @@ MAILER(smtp)dnl
 dnl
 dnl Finally, we have the local cf-style goo
 LOCAL_CONFIG
+# Treat mail to openbsd.{org,net,com} as local
+Cw openbsd.org
+Cw openbsd.net
+Cw openbsd.com
+Cw anonopenbsd.cs.colorado.edu
 #
 #  Regular expression to reject:
 #    * numeric-only localparts from aol.com and msn.com