Mercurial > emacs
changeset 55786:a4b0f825c65a
(smtpmail-open-stream): Bind
starttls-extra-arguments too, if starttls.el uses GNUTLS.
| author | Simon Josefsson <jas@extundo.com> |
|---|---|
| date | Fri, 28 May 2004 05:56:19 +0000 |
| parents | 310e8ba0a51e |
| children | eeff3f9a8140 |
| files | lisp/mail/smtpmail.el |
| diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/smtpmail.el Fri May 28 05:51:46 2004 +0000 +++ b/lisp/mail/smtpmail.el Fri May 28 05:56:19 2004 +0000 @@ -483,7 +483,14 @@ (setq cred-key (expand-file-name cred-key))) (file-regular-p (setq cred-cert (expand-file-name cred-cert)))) - (list "--key-file" cred-key "--cert-file" cred-cert)))) + (list "--key-file" cred-key "--cert-file" cred-cert))) + (starttls-extra-arguments + (when (and (stringp cred-key) (stringp cred-cert) + (file-regular-p + (setq cred-key (expand-file-name cred-key))) + (file-regular-p + (setq cred-cert (expand-file-name cred-cert)))) + (list "--x509keyfile" cred-key "--x509certfile" cred-cert)))) (starttls-open-stream "SMTP" process-buffer host port))))) (defun smtpmail-try-auth-methods (process supported-extensions host port)