diff options
author | R David Murray <rdmurray@bitdance.com> | 2014-06-11 19:17:50 (GMT) |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2014-06-11 19:17:50 (GMT) |
commit | 012a83ab261f7b0357e9c29c9022315ab9c7d970 (patch) | |
tree | ed61a03826030a79a84a121928c7f4b751a7ff42 | |
parent | 6ffface4293f20e504de6a7ca012c482a203409d (diff) | |
download | cpython-012a83ab261f7b0357e9c29c9022315ab9c7d970.zip cpython-012a83ab261f7b0357e9c29c9022315ab9c7d970.tar.gz cpython-012a83ab261f7b0357e9c29c9022315ab9c7d970.tar.bz2 |
#14758: Need to specify the desired socket type in the getaddrinfo call.
This worked by accident on Linux because the SOCK_STREAM was returned
first, but on the FreeBSD the SOCK_DGRAM is first in the list.
-rwxr-xr-x | Lib/smtpd.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/smtpd.py b/Lib/smtpd.py index d828c5f..f90fae8 100755 --- a/Lib/smtpd.py +++ b/Lib/smtpd.py @@ -610,7 +610,8 @@ class SMTPServer(asyncore.dispatcher): self._decode_data = decode_data asyncore.dispatcher.__init__(self, map=map) try: - gai_results = socket.getaddrinfo(*localaddr) + gai_results = socket.getaddrinfo(*localaddr, + type=socket.SOCK_STREAM) self.create_socket(gai_results[0][0], gai_results[0][1]) # try to re-use a server port if possible self.set_reuse_addr() |