(smtpmail-open-stream): Bind

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

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 60831b259d80ad9db313b1842a6790fbfe304075..84a61350145111a7f28eec77b71fd181a66b5c86 100644 (file)
--- 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)