1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00

r22929: Attempt to fix some build farm failures: On port 139 the first

successful packet gives len==0 from the server, so the = in

        if (len <= 0) {

in line 136 of clientgen.c throws a failure.

Jeremy, please fix this properly, I'm not merging this to 3_0_26 so that
you can filter it when you merge.

Volker
(This used to be commit 9c5111d8c5)
This commit is contained in:
Volker Lendecke
2007-05-16 09:53:41 +00:00
committed by Gerald (Jerry) Carter
parent 3c5fe9233d
commit cc5c058e59
2 changed files with 27 additions and 1 deletions

View File

@ -1347,7 +1347,7 @@ BOOL cli_session_request(struct cli_state *cli,
cli_send_smb(cli);
DEBUG(5,("Sent session request\n"));
if (!cli_receive_smb(cli))
if (!cli_receive_sessionreply(cli))
return False;
if (CVAL(cli->inbuf,0) == 0x84) {

View File

@ -190,6 +190,32 @@ BOOL cli_receive_smb_return_keepalive(struct cli_state *cli)
return cli_receive_smb_internal(cli, False);
}
/****************************************************************************
Recv an smb session reply
****************************************************************************/
BOOL cli_receive_sessionreply(struct cli_state *cli)
{
ssize_t len;
/* fd == -1 causes segfaults -- Tom (tom@ninja.nl) */
if (cli->fd == -1)
return False;
len = client_receive_smb(cli, False, 0);
/* If the server is not responding, note that now */
if (len < 0) {
DEBUG(0, ("Receiving SMB: Server stopped responding\n"));
cli->smb_rw_error = smb_read_error;
close(cli->fd);
cli->fd = -1;
return False;
}
return True;
}
/****************************************************************************
Read the data portion of a readX smb.
The timeout is in milliseconds