From 4aa609dc300e11fbb28cb4fba2e4330fb6bab82f Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Fri, 28 May 2004 05:56:19 +0000 Subject: [PATCH] (smtpmail-open-stream): Bind starttls-extra-arguments too, if starttls.el uses GNUTLS. --- lisp/mail/smtpmail.el | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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) -- 2.11.4.GIT