# HG changeset patch
# User Simon Josefsson <jas@extundo.com>
# Date 1085723779 0
# Node ID a4b0f825c65a9eebbd28e9b83a48d4a239d5b419
# Parent  310e8ba0a51e1ee90041fc87b53bbea81d03c7fc
(smtpmail-open-stream): Bind
starttls-extra-arguments too, if starttls.el uses GNUTLS.

diff -r 310e8ba0a51e -r a4b0f825c65a lisp/mail/smtpmail.el
--- a/lisp/mail/smtpmail.el	Fri May 28 05:51:46 2004 +0000
+++ b/lisp/mail/smtpmail.el	Fri May 28 05:56:19 2004 +0000
@@ -483,7 +483,14 @@
 			  (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)