summaryrefslogtreecommitdiff
path: root/gnu/usr.sbin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-01-05 23:35:51 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-01-05 23:35:51 +0000
commit111aa3c4b804ab2487c5874e1496719cc06569e4 (patch)
treed28017f8b144c97a49cf8017cecf146ed03e39df /gnu/usr.sbin
parentb757f3eb341ec606ec78c8ecfdd704bf15253be0 (diff)
Sync with reality: make mj2 a trusted user and add 'C' (nocanonify)
flag to MSA for fast message injection.
Diffstat (limited to 'gnu/usr.sbin')
-rw-r--r--gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc13
1 files changed, 8 insertions, 5 deletions
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
index 55b4ee64cc6..739324608c7 100644
--- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
@@ -6,7 +6,7 @@ divert(-1)
#
divert(0)dnl
-VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.8 2001/12/04 02:23:56 millert Exp $')
+VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.9 2002/01/05 23:35:50 millert Exp $')
OSTYPE(openbsd)dnl
dnl
dnl Advertise ourselves as ``openbsd.org''
@@ -33,8 +33,8 @@ dnl
dnl Always use fully qualified domains
FEATURE(always_add_domain)
dnl
-dnl Need to add domo and mailman as "trusted users" to rewrite From lines
-define(`confTRUSTED_USERS', `domo mailman')dnl
+dnl Need to add domo and mj2 as "trusted users" to rewrite From lines
+define(`confTRUSTED_USERS', `domo mj2')dnl
dnl
dnl Wait a day before sending mail about deferred messages
define(`confTO_QUEUEWARN', `1d')dnl
@@ -70,10 +70,13 @@ dnl List the mailers we support
FEATURE(`no_default_msa')dnl
MAILER(local)dnl
MAILER(smtp)dnl
+dnl
+dnl Take note of the 'C' flag (nocanonify) for the MSA connections.
+dnl We use this to speed up mail injections via majordomo.
DAEMON_OPTIONS(`Family=inet, address=0.0.0.0, Name=MTA')dnl
DAEMON_OPTIONS(`Family=inet6, address=::, Name=MTA6, M=O')dnl
-DAEMON_OPTIONS(`Family=inet, address=0.0.0.0, Port=587, Name=MSA, M=E')dnl
-DAEMON_OPTIONS(`Family=inet6, address=::, Port=587, Name=MSA6, M=O, M=E')dnl
+DAEMON_OPTIONS(`Family=inet, address=0.0.0.0, Port=587, Name=MSA, M=EC')dnl
+DAEMON_OPTIONS(`Family=inet6, address=::, Port=587, Name=MSA6, M=O, M=EC')dnl
CLIENT_OPTIONS(`Family=inet6, Address=::')dnl
CLIENT_OPTIONS(`Family=inet, Address=0.0.0.0')dnl
dnl