[Emacs-diffs] Changes to emacs/lisp/mail/smtpmail.el

[Simon Josefsson]

Index: emacs/lisp/mail/smtpmail.el
diff -c emacs/lisp/mail/smtpmail.el:1.67 emacs/lisp/mail/smtpmail.el:1.68
*** emacs/lisp/mail/smtpmail.el:1.67    Fri Apr  9 13:39:05 2004
--- emacs/lisp/mail/smtpmail.el Fri May 28 05:56:19 2004
***************
*** 483,489 ****
                          (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))))
        (starttls-open-stream "SMTP" process-buffer host port)))))
  
  (defun smtpmail-try-auth-methods (process supported-extensions host port)
--- 483,496 ----
                          (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)))
!            (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)