summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1996-08-22 06:32:03 +0000
committerAndrew Tridgell <tridge@samba.org>1996-08-22 06:32:03 +0000
commit9155889092ac9ff476d950a0c1b624ebad3cdad6 (patch)
tree1b65edac5a195405ee1af46967c5c3e9726aeb38 /source3/client
parentcebbbffcae8d1fd1521b50010843b79959c08cef (diff)
downloadsamba-9155889092ac9ff476d950a0c1b624ebad3cdad6.tar.gz
samba-9155889092ac9ff476d950a0c1b624ebad3cdad6.tar.bz2
samba-9155889092ac9ff476d950a0c1b624ebad3cdad6.zip
- add timeouts to connect() for password server connections. This
makes multiple password servers practical. (This used to be commit 5c3e8326cc45d3cbd076475e445ce461a2bf7560)
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/client.c4
-rw-r--r--source3/client/clientutil.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 6bd94be756..cc178967a1 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2956,7 +2956,7 @@ static BOOL send_session_request(char *inbuf,char *outbuf)
putip((char *)&dest_ip,inbuf+4);
close_sockets();
- Client = open_socket_out(SOCK_STREAM, &dest_ip, port);
+ Client = open_socket_out(SOCK_STREAM, &dest_ip, port, LONG_CONNECT_TIMEOUT);
if (Client == -1)
return False;
@@ -4025,7 +4025,7 @@ static BOOL open_sockets(int port )
}
}
- Client = open_socket_out(SOCK_STREAM, &dest_ip, port);
+ Client = open_socket_out(SOCK_STREAM, &dest_ip, port, LONG_CONNECT_TIMEOUT);
if (Client == -1)
return False;
diff --git a/source3/client/clientutil.c b/source3/client/clientutil.c
index e684d42612..3058f65474 100644
--- a/source3/client/clientutil.c
+++ b/source3/client/clientutil.c
@@ -212,7 +212,7 @@ BOOL cli_send_session_request(char *inbuf, char *outbuf)
putip((char *)&dest_ip,inbuf+4);
close_sockets();
- Client = open_socket_out(SOCK_STREAM, &dest_ip, port);
+ Client = open_socket_out(SOCK_STREAM, &dest_ip, port, SHORT_CONNECT_TIMEOUT);
if (Client == -1)
return False;
@@ -835,7 +835,7 @@ BOOL cli_open_sockets(int port)
putip((char *)&dest_ip,(char *)hp->h_addr);
}
- Client = open_socket_out(SOCK_STREAM, &dest_ip, port);
+ Client = open_socket_out(SOCK_STREAM, &dest_ip, port, SHORT_CONNECT_TIMEOUT);
if (Client == -1)
return False;