Mercurial > emacs
comparison lisp/mail/smtpmail.el @ 55786:a4b0f825c65a
(smtpmail-open-stream): Bind
starttls-extra-arguments too, if starttls.el uses GNUTLS.
| author | Simon Josefsson <jas@extundo.com> |
|---|---|
| date | Fri, 28 May 2004 05:56:19 +0000 |
| parents | 63ed691cfee6 |
| children | 2b938e7f92a5 4c90ffeb71c5 |
comparison
equal
deleted
inserted
replaced
| 55785:310e8ba0a51e | 55786:a4b0f825c65a |
|---|---|
| 481 (when (and (stringp cred-key) (stringp cred-cert) | 481 (when (and (stringp cred-key) (stringp cred-cert) |
| 482 (file-regular-p | 482 (file-regular-p |
| 483 (setq cred-key (expand-file-name cred-key))) | 483 (setq cred-key (expand-file-name cred-key))) |
| 484 (file-regular-p | 484 (file-regular-p |
| 485 (setq cred-cert (expand-file-name cred-cert)))) | 485 (setq cred-cert (expand-file-name cred-cert)))) |
| 486 (list "--key-file" cred-key "--cert-file" cred-cert)))) | 486 (list "--key-file" cred-key "--cert-file" cred-cert))) |
| 487 (starttls-extra-arguments | |
| 488 (when (and (stringp cred-key) (stringp cred-cert) | |
| 489 (file-regular-p | |
| 490 (setq cred-key (expand-file-name cred-key))) | |
| 491 (file-regular-p | |
| 492 (setq cred-cert (expand-file-name cred-cert)))) | |
| 493 (list "--x509keyfile" cred-key "--x509certfile" cred-cert)))) | |
| 487 (starttls-open-stream "SMTP" process-buffer host port))))) | 494 (starttls-open-stream "SMTP" process-buffer host port))))) |
| 488 | 495 |
| 489 (defun smtpmail-try-auth-methods (process supported-extensions host port) | 496 (defun smtpmail-try-auth-methods (process supported-extensions host port) |
| 490 (let* ((mechs (cdr-safe (assoc 'auth supported-extensions))) | 497 (let* ((mechs (cdr-safe (assoc 'auth supported-extensions))) |
| 491 (mech (car (smtpmail-intersection smtpmail-auth-supported mechs))) | 498 (mech (car (smtpmail-intersection smtpmail-auth-supported mechs))) |