Expose the ESMTP name and password options.

svn path=/trunk/; revision=3596

1 files changed, 16 insertions, 3 deletions

diff --git a/fetchmail.man b/fetchmail.man
index b03544dc..e68073fd 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -664,7 +664,7 @@ editor like
 written in Python.
 
 .SH USER AUTHENTICATION AND ENCRYPTION
-All modes except ETRN require authentication of the client.
+All modes except ETRN require authentication of the client to the server.
 Normal user authentication in 
 .I fetchmail
 is very much like the authentication mechanism of 
@@ -821,7 +821,7 @@ by a recognized Certifying Authority.  The format for the key files and
 the certificate files is that required by the underlying SSL libraries
 (OpenSSL in the general case).
 .PP
-Finally, a word of care about the use of SSL: While above mentioned
+A word of care about the use of SSL: While above mentioned
 setup with self-signed server certificates retrieved over the wires
 can protect you from a passive eavesdropper it doesn't help against an
 active attacker. It's clearly an improvement over sending the
@@ -830,6 +830,12 @@ attack is trivially possible (in particular with tools such as dsniff,
 http://www.monkey.org/~dugsong/dsniff/).  Use of an ssh tunnel (see
 below for some examples) is preferable if you care seriously about the
 security of your mailbox.
+.PP
+.B fetchmail
+also supports authentication to the ESMTP server on the client side
+according to RFC 2554.  You can specify a name/password pair to be
+used with the keywords `esmtpname' and `esmtppassword'; the former
+defaults to the username of the calling user.
 
 .SH DAEMON MODE
 The 
@@ -1305,6 +1311,12 @@ T}
 principal   	\&	T{
 Set Kerberos principal (only useful with imap and kerberos)
 T}
+esmtpname   	\&	T{
+Set name for RFC2554 authentication to the ESMTP server.
+T}
+esmtppassword   	\&	T{
+Set password for RFC2554 authentication to the ESMTP server.
+T}
 .TE
 
 Here are the legal user options:
@@ -2193,7 +2205,8 @@ mutt(1), elm(1), mail(1), sendmail(8), popd(8), imapd(8), netrc(5)
 .SH APPLICABLE STANDARDS
 .TP 5
 SMTP/ESMTP:
-RFC 821, RFC2821, RFC 1869, RFC 1652, RFC 1870, RFC1983, RFC 1985
+RFC 821, RFC2821, RFC 1869, RFC 1652, RFC 1870, RFC 1983, RFC 1985,
+RFC 2554
 .TP 5
 mail:
 RFC 822, RFC2822, RFC 1123, RFC 1892, RFC 1894