(smtpmail-open-stream): Bind

starttls-extra-arguments too, if starttls.el uses GNUTLS.

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'.")
                           (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)