2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f06baba448..92010690e3c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
+        lines in base64-encoded authentication response.
+
 2006-09-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * progmode/ebnf2ps.el: Doc fix. Implement arrow spacing and scaling.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 3fc0477a0a0..a39950a6b65 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -541,7 +541,7 @@ 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))
-                 (encoded (base64-encode-string response)))
+                 (encoded (base64-encode-string response t)))
             (smtpmail-send-command process (format "%s" encoded))
             (if (or (null (car (setq ret (smtpmail-read-response process))))
                     (not (integerp (car ret)))
@@ -554,12 +554,12 @@ This is relative to `smtpmail-queue-dir'.")
                 (>= (car ret) 400))
             (throw 'done nil))
         (smtpmail-send-command
-         process (base64-encode-string (smtpmail-cred-user cred)))
+         process (base64-encode-string (smtpmail-cred-user cred t)))
         (if (or (null (car (setq ret (smtpmail-read-response process))))
                 (not (integerp (car ret)))
                 (>= (car ret) 400))
             (throw 'done nil))
-        (smtpmail-send-command process (base64-encode-string passwd))
+        (smtpmail-send-command process (base64-encode-string passwd t))
         (if (or (null (car (setq ret (smtpmail-read-response process))))
                 (not (integerp (car ret)))
                 (>= (car ret) 400))
@@ -576,7 +576,7 @@ This is relative to `smtpmail-queue-dir'.")
                                         (concat "\0"
                                                 (smtpmail-cred-user cred)
                                                 "\0"
-                                                passwd))))
+                                                passwd) t)))
         (if (or (null (car (setq ret (smtpmail-read-response process))))
                 (not (integerp (car ret)))
                 (not (equal (car ret) 235)))