From 0b86d5175a454ab0107bd9128da8802a76c59fa7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 5 Jul 2016 09:13:59 +0530
Subject: [PATCH] Port fix for CVE-2016-0772 from upstream

---
 src/calibre/utils/smtplib.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/calibre/utils/smtplib.py b/src/calibre/utils/smtplib.py
index 0090c3a443..1cf7267349 100755
--- a/src/calibre/utils/smtplib.py
+++ b/src/calibre/utils/smtplib.py
@@ -651,6 +651,11 @@ class SMTP:
             self.ehlo_resp = None
             self.esmtp_features = {}
             self.does_esmtp = 0
+        else:
+            # RFC 3207:
+            # 501 Syntax error (no parameters allowed)
+            # 454 TLS not available due to temporary reason
+            raise SMTPResponseException(resp, reply)
         return (resp, reply)
 
     def sendmail(self, from_addr, to_addrs, msg, mail_options=[],