From 85a162088f56ec197b7ccc6d2f9ad23a691a362d Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 27 Sep 2011 19:45:18 +0200 Subject: [PATCH] * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection. Fixes: debbugs:9615 --- lisp/ChangeLog | 5 +++++ lisp/mail/smtpmail.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 50dccb43b3..8bbb7f5fcc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-09-27 Lars Magne Ingebrigtsen + + * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection + (bug#9615). + 2011-09-27 Chong Yidong * emacs-lisp/package.el (list-packages): Fix echo area message. diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 1c6f2c7b7e..edcc82011a 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -658,7 +658,7 @@ The list is in preference order.") :always-query-capabilities t :starttls-function (lambda (capabilities) - (and (string-match "-STARTTLS" capabilities) + (and (string-match "[ -]STARTTLS" capabilities) "STARTTLS\r\n")) :client-certificate t :use-starttls-if-possible t))) -- 2.20.1