From 42c63cb6ddb4864f155a3a844f512a1add61b50f Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <jsha@eff.org>
Date: Mon, 8 Sep 2014 16:25:40 -0400
Subject: [PATCH] More informative message for RDNS fail.

---
 CheckSTARTTLS.py | 11 ++++++++---
 requirements.txt |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 requirements.txt

diff --git a/CheckSTARTTLS.py b/CheckSTARTTLS.py
index e8adc010e..e5c5a4323 100755
--- a/CheckSTARTTLS.py
+++ b/CheckSTARTTLS.py
@@ -135,8 +135,13 @@ def supports_starttls(mx_host):
   except socket.error as e:
     print "Connection to %s failed: %s" % (mx_host, e.strerror)
     return False
-  except smtplib.SMTPException:
-    print "No STARTTLS support on %s" % mx_host
+  except smtplib.SMTPException, e:
+    # In order to talk to some hosts, you need to run this from a host that has a
+    # reverse DNS entry. AWS instances all have reverse DNS, as an example.
+    if e[0] == 554:
+      print e[1]
+    else:
+      print "No STARTTLS support on %s" % mx_host, e[0]
     return False
 
 def min_tls_version(mail_domain):
@@ -172,8 +177,8 @@ if __name__ == '__main__':
     for domain in open(input).readlines():
       domain = domain.strip()
       suffix = check_certs(domain)
-      min_version = min_tls_version(domain)
       if suffix != "":
+        min_version = min_tls_version(domain)
         suffix_match = "." + suffix
         config["acceptable-mxs"][domain] = {
           "accept-mx-domains": [suffix_match]
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000000000..891e5809d
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+dnspython
+publicsuffix
+m2crypto