diff options
| author | Teodor Zlatanov <tzz@lifelogs.com> | 2008-05-12 12:40:12 +0000 |
|---|---|---|
| committer | Teodor Zlatanov <tzz@lifelogs.com> | 2008-05-12 12:40:12 +0000 |
| commit | e64a3841c4188f2823ad66abf59173ae2c4095ce (patch) | |
| tree | 17340095d1bef528fe5b9fd0108d198cc03c8f9d /lisp/mail | |
| parent | 97d1c236346a769783a46ba6b11a18f5613c79a8 (diff) | |
| download | emacs-e64a3841c4188f2823ad66abf59173ae2c4095ce.tar.gz | |
Add autoload for
`auth-source-user-or-password'.
(smtpmail-try-auth-methods): Use it.
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/smtpmail.el | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 4565cda944c..3a5e8528c5f 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -78,6 +78,9 @@ (autoload 'netrc-get "netrc") (autoload 'password-read "password-cache") +(eval-and-compile + (autoload 'auth-source-user-or-password "auth-source")) + ;;; (defgroup smtpmail nil "SMTP protocol for sending mail." @@ -539,17 +542,26 @@ This is relative to `smtpmail-queue-dir'." (defun smtpmail-try-auth-methods (process supported-extensions host port) (let* ((mechs (cdr-safe (assoc 'auth supported-extensions))) (mech (car (smtpmail-intersection smtpmail-auth-supported mechs))) - (cred (if (stringp smtpmail-auth-credentials) - (let* ((netrc (netrc-parse smtpmail-auth-credentials)) - (port-name (format "%s" (or port "smtp"))) - (hostentry (netrc-machine netrc host port-name - port-name))) - (when hostentry - (list host port - (netrc-get hostentry "login") - (netrc-get hostentry "password")))) - (smtpmail-find-credentials - smtpmail-auth-credentials host port))) + (auth-user (auth-source-user-or-password + "login" host (or port "smtp"))) + (auth-pass (auth-source-user-or-password + "password" host (or port "smtp"))) + (cred (if (and auth-user auth-pass) ; try user-auth-* before netrc-* + (list host port auth-user auth-pass) + ;; else, if auth-source didn't return them... + (if (stringp smtpmail-auth-credentials) + (let* ((netrc (netrc-parse smtpmail-auth-credentials)) + (port-name (format "%s" (or port "smtp"))) + (hostentry (netrc-machine netrc host port-name + port-name))) + (when hostentry + (list host port + (netrc-get hostentry "login") + (netrc-get hostentry "password")))) + ;; else, try smtpmail-find-credentials since + ;; smtpmail-auth-credentials is not a string + (smtpmail-find-credentials + smtpmail-auth-credentials host port)))) (prompt (when cred (format "SMTP password for %s:%s: " (smtpmail-cred-server cred) (smtpmail-cred-port cred)))) |