summaryrefslogtreecommitdiff
path: root/lisp/mail/smtpmail.el
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-06-22 16:48:31 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2011-06-22 16:48:31 +0200
commitddb7ffeeb8ace6501eb453f50f0f9f6852eda21f (patch)
treed15181da4f25be194cb80cae8556cdabc2f887bf /lisp/mail/smtpmail.el
parentd5a19415d0bc308557d754e4438a2656e16bb0ab (diff)
downloademacs-ddb7ffeeb8ace6501eb453f50f0f9f6852eda21f.tar.gz
emacs-ddb7ffeeb8ace6501eb453f50f0f9f6852eda21f.tar.bz2
emacs-ddb7ffeeb8ace6501eb453f50f0f9f6852eda21f.zip
When the .authinfo file has a user name but not a password, prompt
for the password.
Diffstat (limited to 'lisp/mail/smtpmail.el')
-rw-r--r--lisp/mail/smtpmail.el15
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 58a517ba836..b1685067c08 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -483,12 +483,15 @@ The list is in preference order.")
'((user . "SMTP user at %h: ")
(secret . "SMTP password for %u@%h: ")))
(auth-info (car
- (auth-source-search :max 1
- :host host
- :port (if port
- (format "%s" port)
- "smtp")
- :create ask-for-password)))
+ (auth-source-search
+ :max 1
+ :host host
+ :port (if port
+ (format "%s" port)
+ "smtp")
+ :require (and ask-for-password
+ '(:user :secret))
+ :create ask-for-password)))
(user (plist-get auth-info :user))
(password (plist-get auth-info :secret))
(save-function (and ask-for-password