diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2008-06-09 14:47:02 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2008-06-09 14:47:02 +0000 |
| commit | 930b1497fdb0d1b14505337df7971a6f2ee05d67 (patch) | |
| tree | 235cf587b63e0c3a0762446bfc5049ae32132042 /gnu/usr.sbin | |
| parent | a6cbd46c4bbd9bee9993ab41485fc0ef77b26871 (diff) | |
Disable ident queries
Crank max queue children in bulk config
Use the C flag in DAEMON_OPTIONS instead of nocanonify in bulk config
Diffstat (limited to 'gnu/usr.sbin')
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc | 19 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc | 5 |
2 files changed, 13 insertions, 11 deletions
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc index be6f07fdd58..05095e47136 100644 --- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc +++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc @@ -6,7 +6,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$OpenBSD: openbsd-bulk.mc,v 1.3 2008/04/02 15:03:01 millert Exp $') +VERSIONID(`$OpenBSD: openbsd-bulk.mc,v 1.4 2008/06/09 14:47:01 millert Exp $') OSTYPE(openbsd)dnl dnl dnl Advertise ourselves as ``openbsd.org'' @@ -18,6 +18,9 @@ define(`confMAX_HOP', `30')dnl define(`confQUEUE_LA', `25')dnl define(`confREFUSE_LA', `100')dnl dnl +dnl Disable ident queries +define(`confTO_IDENT', `0')dnl +dnl dnl Some alternate paths so we don't conflict with sendmail on port 25 define(`confPID_FILE', `/var/run/bulkmail.pid')dnl dnl @@ -34,10 +37,9 @@ define(`confWORK_RECIPIENT_FACTOR', `0')dnl define(`confWORK_CLASS_FACTOR', `0')dnl define(`confRETRY_FACTOR', `90000')dnl dnl -dnl One queue group, many dirs, max 80 runners -define(`confMAX_QUEUE_CHILDREN', `80') +dnl One queue group, many dirs, max 90 runners +define(`confMAX_QUEUE_CHILDREN', `90') QUEUE_GROUP(`mqueue', `P=/var/spool/mqueue/bulk*, R=5, r=10, F=f I=1')dnl -dnl QUEUE_GROUP(`retry', `P=/var/spool/mqueue/fail*, R=5, r=10, F=f I=5 N=4')dnl dnl dnl Add a prefix to differentiate outgoing bulk messages from incoming ones define(`confPROCESS_TITLE_PREFIX', `bulk')dnl @@ -56,9 +58,6 @@ dnl dnl Always use fully qualified domains FEATURE(always_add_domain)dnl dnl -dnl No need to do DNS lookups on addresses, they've already been done -FEATURE(nocanonify)dnl -dnl dnl Wait a day before sending mail about deferred messages define(`confTO_QUEUEWARN', `1d')dnl dnl @@ -96,8 +95,8 @@ MAILER(local)dnl MAILER(smtp)dnl dnl dnl Only accept connections from localhost on port 24, use ipv6 or ipv4 -dnl for delivery. -DAEMON_OPTIONS(`Family=inet6, address=::1, Name=MTA6, Port=24, M=OS')dnl -DAEMON_OPTIONS(`Family=inet, address=127.0.0.1, Name=MTA, Port=24, M=S')dnl +dnl for delivery and disable canonification. +DAEMON_OPTIONS(`Family=inet6, address=::1, Name=MTA6, Port=24, M=COS')dnl +DAEMON_OPTIONS(`Family=inet, address=127.0.0.1, Name=MTA, Port=24, M=CS')dnl CLIENT_OPTIONS(`Family=inet6, Address=::')dnl CLIENT_OPTIONS(`Family=inet, Address=0.0.0.0')dnl diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc index 1fd1d4807fb..5a6a4f347c0 100644 --- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc +++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc @@ -8,7 +8,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.17 2008/04/02 15:03:01 millert Exp $') +VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.18 2008/06/09 14:47:01 millert Exp $') OSTYPE(openbsd)dnl dnl dnl Advertise ourselves as ``openbsd.org'' @@ -21,6 +21,9 @@ define(`confMAX_HOP', `30')dnl define(`confQUEUE_LA', `6')dnl define(`confREFUSE_LA', `20')dnl dnl +dnl Disable ident queries +define(`confTO_IDENT', `0')dnl +dnl dnl Some broken nameservers will return SERVFAIL (a temporary failure) dnl on T_AAAA (IPv6) lookups. define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl |