diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2013-07-19 21:14:53 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2013-07-19 21:14:53 +0000 |
| commit | 89ca14ddb53440286ab2ed0c2b9e4473dda6d12e (patch) | |
| tree | cf8744bfc84648a1c7489c187f08afd665f2dcaf /usr.sbin/smtpd/smtpd.conf.5 | |
| parent | 012c74efba199a734b02042792ff1c3e8f7b4546 (diff) | |
Many MTA improvements:
- Better transient error handling logic: failing destinations are
automatically disabled for a while. When a destination is active
again, ask the scheduler to retry previous envelopes immediatly.
- More informative error report when all routes fail for a mail.
- Implement a "smtpctl show hoststats" command to get the latest stat
message per MX domain.
- Implement a "smtpctl show routes" command to show the state the
currently known routes to remote MXs.
- Implement a "smtpctl resume route" command to re-enable a route that
has been disabled.
- Do not hardcode limits
- Minor code improvements
Diffstat (limited to 'usr.sbin/smtpd/smtpd.conf.5')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.conf.5 | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 index 492a9e7f0a2..e8a00535cca 100644 --- a/usr.sbin/smtpd/smtpd.conf.5 +++ b/usr.sbin/smtpd/smtpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: smtpd.conf.5,v 1.101 2013/07/19 20:37:07 eric Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.102 2013/07/19 21:14:52 eric Exp $ .\" .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org> .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> @@ -312,7 +312,7 @@ If the parameter is specified, .Xr smtpd 8 will explicitly bind to an address found in the table referenced by -.Ar source +.Ar table when connecting to the relay. If the table contains more than one address, they are picked in turn each time a new connection is opened. @@ -406,7 +406,7 @@ If the parameter is specified, .Xr smtpd 8 will explicitly bind to an address found in the table referenced by -.Ar source +.Ar table when connecting to the relay. If the table contains more than one address, they are picked in turn each time a new connection is opened. @@ -451,6 +451,26 @@ expire 10h # expire after 10 hours .Ed .It Xo .Bk -words +.Ic limit mta +.Op Ic for Ic domain Ar domain +.Ar family +.Ek +.Xc +Instruct +.Xr smtpd 8 +to only use the specified address +.Ar family +for out-going connections. +Accepted values are +.Ic inet4 +and +.Ic inet6 . +If a +.Ar domain +is specified, the restriction only applies when connecting +to MXs for this domain. +.It Xo +.Bk -words .Ic listen on Ar interface .Op Ar family .Op Ic port Ar port |