From 0832bf5a6a32926c41a8a571569453d8ba9432fa Mon Sep 17 00:00:00 2001
From: Sylvain Baubeau <sylvain.baubeau@agorabox.org>
Date: Fri, 11 Mar 2011 03:55:39 +0100
Subject: Removed wrong timeout parameter

https://fedorahosted.org/freeipa/ticket/1086

Add Sylvain Baubeau to Contributors.txt
---
 Contributors.txt    | 1 +
 ipapython/nsslib.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Contributors.txt b/Contributors.txt
index 6cc9b1f4..a9ad82b5 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 3c42b61a..1de00243 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))
-- 
cgit