summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-17 02:45:56 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-17 02:45:56 +0200
commit4e190b801d917b3c5080442c1daba38020c3fe8c (patch)
treeea66f2d280b177de33377643b90009f22faf079e
parent64a465b2d97d00f27ed74513047ced07b798b9fd (diff)
downloademacs-4e190b801d917b3c5080442c1daba38020c3fe8c.tar.gz
(smtpmail-via-smtp): Query the user for password if we get errors 550 to 554.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/smtpmail.el9
2 files changed, 10 insertions, 4 deletions
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)