diff options
| author | Simon Josefsson <[email protected]> | 2004-05-28 05:56:19 +0000 |
|---|---|---|
| committer | Simon Josefsson <[email protected]> | 2004-05-28 05:56:19 +0000 |
| commit | 4aa609dc300e11fbb28cb4fba2e4330fb6bab82f (patch) | |
| tree | c6b5027b5ad8015455597239dc7d1a43c2e85f23 /lisp/mail | |
| parent | c7bd999c1c9daec7e815da6fd7beb92c043c5be7 (diff) | |
(smtpmail-open-stream): Bind
starttls-extra-arguments too, if starttls.el uses GNUTLS.
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/smtpmail.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 60831b259d..84a6135014 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -483,7 +483,14 @@ This is relative to `smtpmail-queue-dir'.") (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) |