diff options
| author | Andrew Tridgell <tridge@samba.org> | 1996-08-22 06:32:03 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1996-08-22 06:32:03 +0000 |
| commit | 9155889092ac9ff476d950a0c1b624ebad3cdad6 (patch) | |
| tree | 1b65edac5a195405ee1af46967c5c3e9726aeb38 /source3/include | |
| parent | cebbbffcae8d1fd1521b50010843b79959c08cef (diff) | |
| download | samba-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/include')
| -rw-r--r-- | source3/include/local.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source3/include/local.h b/source3/include/local.h index 5a577909e1..3f8572e73d 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -150,4 +150,8 @@ by many apps */ #define KEEP_PASSWORD_SERVER_OPEN 1 +/* how long to wait for a socket connect to happen */ +#define LONG_CONNECT_TIMEOUT 30 +#define SHORT_CONNECT_TIMEOUT 5 + #endif diff --git a/source3/include/proto.h b/source3/include/proto.h index f8685d21ea..e20238fee4 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -856,6 +856,7 @@ BOOL strhaslower(char *s); int count_chars(char *s,char c); void make_dir_struct(char *buf,char *mask,char *fname,unsigned int size,int mode,time_t date); void close_low_fds(void); +int set_blocking(int fd, int set); int write_socket(int fd,char *buf,int len); int read_udp_socket(int fd,char *buf,int len); int read_with_timeout(int fd,char *buf,int mincnt,int maxcnt,long time_out); @@ -891,7 +892,7 @@ void Abort(void ); BOOL get_myname(char *my_name,struct in_addr *ip); BOOL ip_equal(struct in_addr ip1,struct in_addr ip2); int open_socket_in(int type, int port, int dlevel,uint32 socket_addr); -int open_socket_out(int type, struct in_addr *addr, int port ); +int open_socket_out(int type, struct in_addr *addr, int port ,int timeout); int interpret_protocol(char *str,int def); int interpret_security(char *str,int def); uint32 interpret_addr(char *str); |