(smtpmail-try-auth-methods): If the user has stored a user name, then

query for the password first, instead of waiting for SMTP to give an
error message and the trying again.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6fb8a993d5753e194a597297008c7f2f1022b21a..86cf9e06b11a5898435faa4f691ca35628117a57 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mail/smtpmail.el (smtpmail-try-auth-methods): If the user has
+       stored a user name, then query for the password first, instead of
+       waiting for SMTP to give an error message and the trying again.
+
 2011-06-22  Lawrence Mitchell  <wence@gmx.li>
 
        * net/browse-url.el (browse-url-xdg-open): Use 0, rather than nil

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index b1685067c0879a0e8eb21c12e6e472a9d88cbd2b..3c9ea9de5738b9ede472665c3a5a374f31623fd7 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -477,6 +477,10 @@ The list is in preference order.")
 
 (defun smtpmail-try-auth-methods (process supported-extensions host port
                                          &optional ask-for-password)
+  (setq port
+       (if port
+           (format "%s" port)
+         "smtp"))
   (let* ((mechs (cdr-safe (assoc 'auth supported-extensions)))
         (mech (car (smtpmail-intersection mechs smtpmail-auth-supported)))
         (auth-source-creation-prompts
@@ -486,9 +490,7 @@ The list is in preference order.")
                     (auth-source-search
                      :max 1
                      :host host
-                     :port (if port
-                               (format "%s" port)
-                             "smtp")
+                     :port port
                      :require (and ask-for-password
                                    '(:user :secret))
                      :create ask-for-password)))
@@ -497,6 +499,20 @@ The list is in preference order.")
         (save-function (and ask-for-password
                             (plist-get auth-info :save-function)))
         ret)
+    (when (and user
+              (not password))
+      ;; The user has stored the user name, but not the password, so
+      ;; ask for the password, even if we're not forcing that through
+      ;; `ask-for-password'.
+      (setq auth-info
+           (car
+            (auth-source-search
+             :max 1
+             :host host
+             :port port
+             :require '(:user :secret)
+             :create t))
+           password (plist-get auth-info :secret)))
     (when (functionp password)
       (setq password (funcall password)))
     (cond