(smtpmail-via-smtp): Query the user for password if we get errors 550 to 554.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15f742ed91ae0923999382d9b91481823d482f65..ae54b3733f68840d7a399f68611015ce8da288ac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mail/smtpmail.el (smtpmail-via-smtp): Query the user for
+       password if we get errors 550 to 554.
+
 2011-07-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * net/gnutls.el (gnutls-log-level): Removed.

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 073e2fa4a3cdae21e69ac3415f4e2f12577707c1..cc46660712f7c03cd935f8b1614d0e5abf420376 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -788,10 +788,11 @@ The list is in preference order.")
                  nil)
                 ((and auth-mechanisms
                       (not ask-for-password)
-                      (= (car result) 550))
-                 ;; We got a "550 relay not permitted", and the server
-                 ;; accepts credentials, so we try again, but ask for a
-                 ;; password first.
+                      (>= (car result) 550)
+                      (<= (car result) 554))
+                 ;; We got a "550 relay not permitted" (or the like),
+                 ;; and the server accepts credentials, so we try
+                 ;; again, but ask for a password first.
                  (smtpmail-send-command process "QUIT")
                  (smtpmail-read-response process)
                  (delete-process process)