From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 17 Jul 2011 00:45:56 +0000 (+0200)
Subject: (smtpmail-via-smtp): Query the user for password if we get errors 550 to 554.
X-Git-Tag: emacs-pretest-24.0.90~104^2~216
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e190b801d917b3c5080442c1daba38020c3fe8c;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15f742ed91a..ae54b3733f6 100644
--- 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 073e2fa4a3c..cc46660712f 100644
--- 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)