From fc7a1ee35e3bc7aff7a78e0e8e066699fa70fa4b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 30 Apr 2004 13:58:23 +0000 Subject: r426: fixed bug noticed by wim.delvaux@adaptiveplanet.com in handling of timeout in socket connections (This used to be commit 88278b24de4e3e408ac8a6139bd375a72bc664ce) --- source3/lib/util_sock.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source3') diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 845aaa4b13..3984f5e8ac 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -741,6 +741,7 @@ int open_socket_out(int type, struct in_addr *addr, int port ,int timeout) if (ret < 0 && (errno == EINPROGRESS || errno == EALREADY || errno == EAGAIN) && (connect_loop < timeout) ) { smb_msleep(connect_loop); + timeout -= connect_loop; connect_loop += increment; if (increment < 250) { /* After 8 rounds we end up at a max of 255 msec */ -- cgit