Merge branch 'master' of github.com:ironport/shrapnel into eric-ssh

1eb3a2c5 · Sam Rushing · 0e4e4c7d · 99379b6c · 1eb3a2c5
Commit 1eb3a2c5 authored Apr 29, 2013 by Sam Rushing
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

coro/dns/cache.py coro/dns/cache.py +1 -1

No files found.
--- a/coro/dns/cache.py
+++ b/coro/dns/cache.py
@@ -267,7 +267,7 @@ class dns_cache:
                stype = coro.SOCK.STREAM
            else:
                stype = coro.SOCK.DGRAM
-            s = coro.make_socket (stype, sfamily)
+            s = coro.make_socket (sfamily, stype)
        except OSError, why:
            self.log ('COMMON.APP_FAILURE', tb.traceback_string() + ' why: ' + str(why))
            raise DNS_Soft_Error, (qname, qtype, ip, str(why))