Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 482)

   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 156)

   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-224

diff --git a/contrib/smtpmail.el b/contrib/smtpmail.el
index 9557844..ac87a93 100644 (file)
--- a/contrib/smtpmail.el
+++ b/contrib/smtpmail.el
@@ -541,6 +541,17 @@ This is relative to `smtpmail-queue-dir'.")
                 (decoded (base64-decode-string challenge))
                 (hash (rfc2104-hash 'md5 64 16 passwd decoded))
                 (response (concat (smtpmail-cred-user cred) " " hash))
+                ;; Osamu Yamane <yamane@green.ocn.ne.jp>:
+                ;; SMTP auth fails because the SMTP server identifies
+                ;; only the first part of the string (delimited by
+                ;; new line characters) as a response from the
+                ;; client, and the rest as distinct commands.
+
+                ;; In my case, the response string is 80 characters
+                ;; long.  Without the no-line-break option for
+                ;; base64-encode-sting, only the first 76 characters
+                ;; are taken as a response to the server, and the
+                ;; authentication fails.
                 (encoded (base64-encode-string response t)))
            (smtpmail-send-command process (format "%s" encoded))
            (if (or (null (car (setq ret (smtpmail-read-response process))))