From: Jan-Philip Gehrcke <jgehrcke@googlemail.com>
Date: Tue, 22 Jul 2014 14:14:41 +0000 (+0200)
Subject: scripts/mailtest: fix socket family check.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7221309ebb462b05e6582dd9a1804b657ff01b7f;p=discourse_docker.git

scripts/mailtest: fix socket family check.

There is no AddressFamily attribute:

Traceback (most recent call last):
  File "/var/docker/scripts/mailtest", line 140, in <module>
    do_tls(smtp,smtp_sslv)
  File "/var/docker/scripts/mailtest", line 44, in do_tls
    if conn.sock.family == socket.AddressFamily.AF_INET:
AttributeError: 'module' object has no attribute 'AddressFamily'

However, there is `socket.AF_INET` etc.
---

diff --git a/scripts/mailtest b/scripts/mailtest
index 416bc2e..3c0548c 100755
--- a/scripts/mailtest
+++ b/scripts/mailtest
@@ -41,7 +41,7 @@ def do_tls(conn, sslv):
             print_warn('WARNING: cannot attempt verification of server certificate:')
             print_warn(' (need Python 3.4+ to attempt verification)')
             # Damn you, openssl. Why don't you support IPv6?
-            if conn.sock.family == socket.AddressFamily.AF_INET:
+            if conn.sock.family == socket.AF_INET:
                 print_warn(' You can verify the certificate manually by running:')
                 print_warn(' echo quit | openssl s_client -CAfile /etc/ssl/certs/ca-certificates.crt \\')
                 print_warn('   -starttls smtp -connect {}:{}'.format(*conn.sock.getpeername()[0:2]))