Merge branch 'mdw/relayhosts'

[qmail] / qmail-smtpd.8

diff --git a/qmail-smtpd.8 b/qmail-smtpd.8
index c4640b8..e53e263 100644 (file)
--- a/qmail-smtpd.8
+++ b/qmail-smtpd.8
@@ -128,18 +128,11 @@ is supplied,
 .B qmail-smtpd
 will reject
 any envelope recipient address with a domain not listed in
-.IR rcpthosts .
-
-Exception:
-If the environment variable
-.B RELAYCLIENT
-is set,
-.B qmail-smtpd
-will ignore
-.IR rcpthosts ,
-and will append the value of
-.B RELAYCLIENT
-to each incoming recipient address.
+.I rcpthosts
+unless the sending host is a designated relay client (see the
+description of the
+.I relayhosts
+file beow).
 
 .I rcpthosts
 may include wildcards:
@@ -152,6 +145,32 @@ may include wildcards:
 Envelope recipient addresses without @ signs are
 always allowed through.
 .TP 5
+.I relayhosts
+Allowed relay clients.  Each line is a host-suffix pair, separated by a
+colon.  If the client's hostname matches one of the hostnames in the
+file, that client is permitted to send mail to any host (i.e., to use us
+as a relay), and the corresponding suffix is appended to all recipient
+addresses generated by the client.
+
+.I relayhosts
+may include wildcards:
+
+.EX
+   heaven.af.mil:
+   .heaven.af.mil:
+   hell.irs.gov:.irs.virtdomain
+.EE
+
+For historical reasons, the
+.B RELAYCLIENT
+environment variable overrides this table.  If
+.B RELAYCLIENT
+is set, it has the same effect as there being a matching entry in the
+.I relayhosts
+file, using the value of
+.B RELAYCLIENT
+as the suffix.
+.TP 5
 .I smtpgreeting
 SMTP greeting message.
 Default: