diff options
| -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 60831b259d8..84a61350145 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el | |||
| @@ -483,7 +483,14 @@ This is relative to `smtpmail-queue-dir'.") | |||
| 483 | (setq cred-key (expand-file-name cred-key))) | 483 | (setq cred-key (expand-file-name cred-key))) |
| 484 | (file-regular-p | 484 | (file-regular-p |
| 485 | (setq cred-cert (expand-file-name cred-cert)))) | 485 | (setq cred-cert (expand-file-name cred-cert)))) |
| 486 | (list "--key-file" cred-key "--cert-file" cred-cert)))) | 486 | (list "--key-file" cred-key "--cert-file" cred-cert))) |
| 487 | (starttls-extra-arguments | ||
| 488 | (when (and (stringp cred-key) (stringp cred-cert) | ||
| 489 | (file-regular-p | ||
| 490 | (setq cred-key (expand-file-name cred-key))) | ||
| 491 | (file-regular-p | ||
| 492 | (setq cred-cert (expand-file-name cred-cert)))) | ||
| 493 | (list "--x509keyfile" cred-key "--x509certfile" cred-cert)))) | ||
| 487 | (starttls-open-stream "SMTP" process-buffer host port))))) | 494 | (starttls-open-stream "SMTP" process-buffer host port))))) |
| 488 | 495 | ||
| 489 | (defun smtpmail-try-auth-methods (process supported-extensions host port) | 496 | (defun smtpmail-try-auth-methods (process supported-extensions host port) |