summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2001-07-25 17:27:57 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2001-07-25 17:27:57 +0000
commit48128b6c31d8ff624023fc1bf5640de874033ecc (patch)
tree7b799ec5d40ba2cc63a066ff83306be428dff4c5 /gnu
parent21998335cb2b35b91fa8e7839c7fec75449a159b (diff)
Sync with reality:
o Use a genericstable instead of the local mailnametable hack o Add IPv6 support.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.sbin/sendmail/cf/cf/courtesan.mc9
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc b/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc
index 8d6ed90aa03..41fc02ce2d5 100644
--- a/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc
@@ -4,7 +4,7 @@ divert(-1)
#
divert(0)dnl
-VERSIONID(`$OpenBSD: courtesan.mc,v 1.3 2001/01/15 21:08:51 millert Exp $')
+VERSIONID(`$OpenBSD: courtesan.mc,v 1.4 2001/07/25 17:27:56 millert Exp $')
OSTYPE(openbsd)
dnl
dnl First, we override some default values
@@ -20,7 +20,7 @@ FEATURE(use_cw_file)dnl
FEATURE(redirect)dnl
MASQUERADE_AS(courtesan.com)dnl
FEATURE(masquerade_envelope)dnl
-FEATURE(mailnametable)dnl
+FEATURE(genericstable, `hash -o /etc/mail/mailnames')dnl
dnl
dnl Virtual domains
FEATURE(stickyhost)dnl
@@ -32,12 +32,15 @@ FEATURE(blacklist_recipients)dnl
FEATURE(dnsbl, `rbl.maps.vix.com', `Rejected - see http://www.mail-abuse.org/rbl/')dnl
FEATURE(dnsbl, `dul.maps.vix.com', `Dialup - see http://www.mail-abuse.org/dul/')dnl
FEATURE(dnsbl, `relays.mail-abuse.org', `Open spam relay - see http://www.mail-abuse.org/rss/')dnl
-dnl FEATURE(dnsbl, `relays.orbs.org', `Open spam relay - see http://www.orbs.org/')dnl
dnl
dnl Then, we enumerate which mailers we support
MAILER(local)
MAILER(smtp)
dnl
+dnl We want to support IPv6
+DAEMON_OPTIONS(`Family=inet, address=0.0.0.0, Name=MTA')dnl
+DAEMON_OPTIONS(`Family=inet6, address=::, Name=MTA6, M=O')dnl
+dnl
dnl Finally, we have the local cf-style goo
LOCAL_CONFIG
#