commit documentation for "helo" in relay rules

1 files changed, 25 insertions, 2 deletions

diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 44ac0be6f64..d4a0f47a62e 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.80 2013/02/04 05:55:58 gilles Exp $
+.\"	$OpenBSD: smtpd.conf.5,v 1.81 2013/02/05 09:49:38 gilles Exp $
 .\"
 .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: February 4 2013 $
+.Dd $Mdocdate: February 5 2013 $
 .Dt SMTPD.CONF 5
 .Os
 .Sh NAME
@@ -463,6 +463,7 @@ This parameter may use conversion specifiers that are expanded before use
 .Op Ic backup Op Ar mx
 .Op Ic as Ar address
 .Op Ic source Ar source
+.Op Ic helo Ar names
 .Xc
 Mail is relayed.
 The routing decision is based on the DNS system.
@@ -500,6 +501,19 @@ will explicitly bind to an address found in the table referenced by
 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.
+.Pp
+By default,
+.Xr smtpd 8
+advertises its local hostname when connecting to a remote server.
+A
+.Ic helo
+parameter may be specified to advertise an alternate hostname.
+Table
+.Ar names
+contains a mapping of IP addresses to hostnames and
+.Xr smtpd 8
+will automatically select the name that matches its source address
+when connected to the remote server.
 .It Xo
 .Ic relay via
 .Ar host
@@ -507,6 +521,7 @@ time a new connection is opened.
 .Op Ic auth Ar <auth>
 .Op Ic as Ar address
 .Op Ic source Ar source
+.Op Ic helo Ar names
 .Xc
 Mail is relayed through the specified
 .Ar host
@@ -578,6 +593,14 @@ will explicitly bind to an address found in the table referenced by
 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.
+.Ic helo
+parameter may be specified to advertise an alternate hostname.
+Table
+.Ar names
+contains a mapping of IP addresses to hostnames and
+.Xr smtpd 8
+will automatically select the name that matches its source address
+when connected to the remote server.
 .El
 .It Ic expire Ar n {s|m|h|d}
 Specify how long a message that matched this rule can stay in the queue.