summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Baubeau <sylvain.baubeau@agorabox.org>2011-03-11 03:55:39 +0100
committerRob Crittenden <rcritten@redhat.com>2011-03-18 14:57:29 -0400
commit0832bf5a6a32926c41a8a571569453d8ba9432fa (patch)
tree4f1577746f36124964ddd56aebe13449515e920e
parent15e213d0258f69feaf6031a8721902f63c864ac2 (diff)
downloadfreeipa-0832bf5a6a32926c41a8a571569453d8ba9432fa.zip
freeipa-0832bf5a6a32926c41a8a571569453d8ba9432fa.tar.gz
freeipa-0832bf5a6a32926c41a8a571569453d8ba9432fa.tar.xz
Removed wrong timeout parameter
https://fedorahosted.org/freeipa/ticket/1086 Add Sylvain Baubeau to Contributors.txt
-rw-r--r--Contributors.txt1
-rw-r--r--ipapython/nsslib.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/Contributors.txt b/Contributors.txt
index 6cc9b1f..a9ad82b 100644
--- a/Contributors.txt
+++ b/Contributors.txt
@@ -58,6 +58,7 @@ Managment:
Karl Wirth
Past and Occasional Contributors:
+ Sylvain Baubeau
Yuri Chornoivan
Frank Cusack
Don Davis
diff --git a/ipapython/nsslib.py b/ipapython/nsslib.py
index 3c42b61..1de0024 100644
--- a/ipapython/nsslib.py
+++ b/ipapython/nsslib.py
@@ -156,7 +156,7 @@ class NSSAddressFamilyFallback(object):
net_addr.port = port
logging.debug("connecting: %s", net_addr)
try:
- self.sock.connect(net_addr, family)
+ self.sock.connect(net_addr)
except Exception, e:
logging.debug("Could not connect socket to %s, error: %s, retrying..",
net_addr, str(e))