diff options
| author | Jeremy Allison <jra@samba.org> | 2007-03-27 21:55:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:58 -0500 |
| commit | 0eab4311946c312795ec5c03c25a340ef0bfc624 (patch) | |
| tree | 47e8e7e5b11a2dd19389102f6959925fb6a29f19 /source3/client | |
| parent | 4a66d0e232271968ba96da50274428916a393975 (diff) | |
| download | samba-0eab4311946c312795ec5c03c25a340ef0bfc624.tar.gz samba-0eab4311946c312795ec5c03c25a340ef0bfc624.tar.bz2 samba-0eab4311946c312795ec5c03c25a340ef0bfc624.zip | |
r21992: Fix keepalive processing when encryption turned on.
Jeremy.
(This used to be commit 8f113ad1918dcd2746ec527ceb79a2a7baa1d415)
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 481fca8f84..b32e5baae6 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -3666,12 +3666,12 @@ static void readline_callback(void) timeout.tv_usec = 0; sys_select_intr(cli->fd+1,&fds,NULL,NULL,&timeout); - /* We deliberately use receive_smb instead of + /* We deliberately use cli_receive_smb_return_keepalive instead of client_receive_smb as we want to receive session keepalives and then drop them here. */ if (FD_ISSET(cli->fd,&fds)) { - if (!receive_smb(cli->fd,cli->inbuf,0)) { + if (!cli_receive_smb_return_keepalive(cli)) { DEBUG(0, ("Read from server failed, maybe it closed the " "connection\n")); return; |