diff options
| author | Jeremy Allison <jra@samba.org> | 1999-02-03 03:18:38 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1999-02-03 03:18:38 +0000 |
| commit | 87dc4ff92fac7f4f74339180735e2a1132c63fb6 (patch) | |
| tree | d7ed1981573aa80c15d5d35d4fa4a9df94423d67 /source/libsmb | |
| parent | 58ed592a48a04d777014817ff6fe8255a684d6d8 (diff) | |
| download | samba-87dc4ff92fac7f4f74339180735e2a1132c63fb6.tar.gz samba-87dc4ff92fac7f4f74339180735e2a1132c63fb6.tar.xz samba-87dc4ff92fac7f4f74339180735e2a1132c63fb6.zip | |
Fixed bug where cli->timeout was in milliseconds, but open_sockets_out
was in seconds. This meant that PDC -> BDC failover took so long it essentiually
didn't happen.
include/client.h: Added explicit comment that cli->timeout should be milliseconds.
include/local.h: Changed LONG_CONNECT_TIMEOUT & SHORT_CONNECT_TIMEOUT to be milliseconds.
lib/smbrun.c: Tidied up fork failure catching.
lib/util_sock.c: Ensured timeout treated as milliseconds.
libsmb/clientgen.c: Added comment.
rpc_server/srv_pipe_hnd.c: Luke's changes.
smbd/chgpasswd.c: Paranoia code for EINTR around sys_waitpid.
Jeremy.
Diffstat (limited to 'source/libsmb')
| -rw-r--r-- | source/libsmb/clientgen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c index 92a90d2ccf8..636bb6db0f7 100644 --- a/source/libsmb/clientgen.c +++ b/source/libsmb/clientgen.c @@ -2424,7 +2424,7 @@ struct cli_state *cli_initialise(struct cli_state *cli) cli->mid = 1; cli->vuid = UID_FIELD_INVALID; cli->protocol = PROTOCOL_NT1; - cli->timeout = 20000; + cli->timeout = 20000; /* Timeout is in milliseconds. */ cli->bufsize = CLI_BUFFER_SIZE+4; cli->max_xmit = cli->bufsize; cli->outbuf = (char *)malloc(cli->bufsize); |