From: Simon Josefsson Date: Sun, 29 Sep 2002 03:19:55 +0000 (+0000) Subject: (smtpmail-via-smtp): Only negotiate starttls on X-Git-Tag: ttn-vms-21-2-B4~13010 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f029e7b0e917f0e349806b40ea3deb0f71d50141;p=emacs.git (smtpmail-via-smtp): Only negotiate starttls on streams that were opened using starttls. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8390ae6cfd4..2ae98888017 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-09-28 Simon Josefsson + + * mail/smtpmail.el (smtpmail-via-smtp): Only negotiate starttls on + streams that were opened using starttls. + 2002-09-28 Paul Reilly * files.el (auto-mode-alist): Add support for Java Enterprise diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 78393348c5d..82fbfdad5ed 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -613,7 +613,7 @@ This is relative to `smtpmail-queue-dir'.") (if (and do-starttls (smtpmail-find-credentials smtpmail-starttls-credentials host port) (member 'starttls supported-extensions) - (process-id process)) + (numberp (process-id process))) (progn (smtpmail-send-command process (format "STARTTLS")) (if (or (null (car (setq response-code (smtpmail-read-response process))))