aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--fetchmail.man19
2 files changed, 14 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 23c4d7f4..913ec635 100644
--- a/NEWS
+++ b/NEWS
@@ -264,7 +264,7 @@ fetchmail 6.3.0 (not yet released officially):
Partial fix of Debian Bug#150137. Fixes Debian Bug#316454. Matthias Andree
* fetchmailconf now sets the service properly after autoprobe. Fixes Debian
Bug#320645. Matthias Andree
-* fetchmail.man: Fix Debian Bug#241883, making global options more clear. Matt
+* Man page: Fix Debian Bug#241883, making global options more clear. Matt
Swift, Matthias Andree.
* When eating IMAP message trailer, don't see any line containing "OK" as the
end of the trailer, but wait for the proper tagged OK line. To work around
@@ -274,6 +274,7 @@ fetchmail 6.3.0 (not yet released officially):
Instead, pass the buck on to the SMTP server and use our own unqualified
hostname. Matthias Andree
* Revise some error messages so they are less confusing. Sunil Shetye.
+* Man page: update --smtphost documentation. Matthias Andree
# INTERNAL CHANGES
* Switched to automake. Matthias Andree.
diff --git a/fetchmail.man b/fetchmail.man
index 7c24d883..9e5e433a 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -436,15 +436,17 @@ For details, see
Specify a hunt list of hosts to forward mail to (one or more
hostnames, comma-separated). Hosts are tried in list order; the first
one that is up becomes the forwarding target for the current run.
-Normally, 'localhost' is added to the end of the list as an invisible
-default. However, when using Kerberos authentication, the FQDN of the
-machine running fetchmail is added to the end of the list as an
-invisible default. Each hostname may have a port number following the
-host name. The port number is separated from the host name by a
-slash; the default port is 25 (or "smtp" under IPv6). If you
+The default depends on the authentication methods and protocols used on
+the active servers. If Kerberos is used for authentication or the ODMR
+or ETRN protocol is used for any active server, the FQDN of the machine
+running fetchmail is used as a default for smtphost. Otherwise,
+'localhost' is used as a default. Each hostname may have a port number
+following the host name. The port number is separated from the host
+name by a slash; the default port is 25 (or "smtp" under IPv6). If you
specify an absolute path name (beginning with a /), it will be
interpreted as the name of a UNIX socket accepting LMTP connections
-(such as is supported by the Cyrus IMAP daemon) Example:
+(such as is supported by the Cyrus IMAP daemon)
+Example:
.sp
.nf
--smtphost server1,server2/2525,server3,/var/imap/socket/lmtp
@@ -2409,6 +2411,9 @@ with the plugin option.
.PP
The 'principal' option only handles Kerberos IV, not V.
.PP
+The --smtphost defaults may not be adequate for your system. In doubt,
+specify this option explicitly to set your forward destination.
+.PP
Send comments, bug reports, gripes, and the like to the
fetchmail-devel list <fetchmail-devel@lists.berlios.de>. An HTML FAQ is
available at the fetchmail home page; surf to