Add comment describing AUTH PLAIN fix.

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a5a89ce61d..1eecc5adb86 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-10  Simon Josefsson  <jas@extundo.com>
+
+        * mail/smtpmail.el (smtpmail-try-auth-methods): Add comment
+        describing AUTH PLAIN fix.
+
 2006-01-10  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * mail/emacsbug.el (report-emacs-bug-text-prompt): Delete var.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 76598ab8a8d..4c7e99601b8 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -1,6 +1,6 @@
 ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
 
-;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
@@ -560,6 +560,11 @@ This is relative to `smtpmail-queue-dir'.")
                 (>= (car ret) 400))
             (throw 'done nil)))
        ((eq mech 'plain)
+        ;; We used to send an empty initial request, and wait for an
+        ;; empty response, and then send the password, but this
+        ;; violate a SHOULD in RFC 2222 paragraph 5.1.  Note that this
+        ;; is not sent if the server did not advertise AUTH PLAIN in
+        ;; the EHLO response.  See RFC 2554 for more info.
         (smtpmail-send-command process
                                (concat "AUTH PLAIN "
                                        (base64-encode-string